Merge "Update fs_mgr tests for new fstab format and add to TEST_MAPPING"