Merge change 4730 into donut

* changes:
  fstest: Fix device, directory, and file permissions for VPN.