Merge "filebackend: normalize paths used in locking"