Merge "change /fstab.* perms to 0640" into jb-dev