Merge changes I51628abe,I412d62b7 into rvc-dev

* changes:
  Wrap flock with TEMP_FAILURE_RETRY.
  Try locking after mounting metadata