gc'ed some TODOs.
REVIEW-2467 Started using a lock id to identify lock files, instead of a file path. Added basic integration test for the file lock contention.