Merge "add -f option to mkbootfs to load file perms from file" into jb-dev