Rhel6to7

Changes for upgrades from pre-systemd, pre-convertfs filesystems.