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.