Merge pull request #4504 from dustint-rh/system_present_uuid_as_id
Fixes #6842 - system uuid as id bz1122938
Merge pull request #4504 from dustint-rh/system_present_uuid_as_id
Fixes #6842 - system uuid as id bz1122938