Fixing a bug when mounting using the UUID but the device is mounted using the actual device.  Results in an attempt to umount and remount.
Merge pull request #18660 from garethgreenaway/18613_2014_7_mount_via_uuid

Fixes to mount state.