Merge "Convert MemcLockManager to using MapCacheLRU"