Stable/havana

Checking if a disk partition is formatted with XFS can be done with the blkid command. Using the xfs_admin command to check the disk label will succeed for other non-XFS file systems like ZFS, causing them not to be reformatted with XFS.