UUID on deployed machine is from imaged machine CENTOS 7.2

Server

FOG Version: 1.3.0 RC23

OS: Centos 7.2

Client

Service Version:

OS: Centos 7.2

Description

Is the UUID issue fixed when imaging? In my fstab I use UUID instead of /dev names and once an image is captured and deployed to new system, the UUIDs in fstab are for the imaged machine not the deployed machine. SWAP will not come up and I have to run blkid, then copy in the new UUID into the fstab for swap to work. Just wondering if there is a fix for this. I have 100+ machines to image so for now I have changed to using /dev/sda format in the fstab and this should not be an issue as we do not change the setup at all.