Merge "Use fs_config files for mksquashfs" into nyc-dev