Merge pull request #2922 from octo/rootfs_prefix