Merge commit '5570651e' * commit '5570651e': fstest: Fix device, directory, and file permissions for VPN.