am de1c33cd: Merge "Fix bug in removal of *.flock files." into mnc-dev

* commit 'de1c33cd34b5b715a53852e53f7007efef9a938c':
  Fix bug in removal of *.flock files.