Merge change 5162 into donut

* changes:
  Preserve file access mode when backing up / restoring files