Fixed issue with the file lock contention handling. Added coverage. Reverted back the long timeout to more reasonable value as we know now that the timeout is not the problem.

(cherry picked from master: commit a23c445)
Fixed some deadlockish scenarios in the DefaultCacheAccess. Added some sanity coverage to the FileLockCommunicator.
(cherry picked from master: commit 2fae9be)