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