Merge "Allow querying for fstab for a mount point with fstype" into main