Merge "Remove mailin/sailfish fstab from the generic system image"