Changed LockingDict to be more generic

Change-Id: I7a671cfb82ace9b0cb9b30741961ec50136d9974