Update auto-partitioning for RHEL7

In RHEL7, the preferred filesystem is now xfs and the efi partition
type is unambiguously present.
Apply previous changes to the pre for rhel7 specifically
Fix mistakes in the adjustment to rhel7 default FS cohice