Fixed generation and uses of guid
Merge pull request #6375 from pjackson28/fixguid

Fixed generation and uses of guid