Fixing a bug if a swap device is specified as one of the special symlinks, eg. the links under /dev/disk/by-uuid
Merge pull request #18666 from garethgreenaway/18550_2014_7_swap_device_symlink

Fixed to mount state related to enabling swap