Address review comments for !440

Valery Sizov requested to merge file_lock_improvements into master Jun 21, 2016