Merge pull request #1406 from robertovargas-arm/uuid

Make TF UUID RFC 4122 compliant