Drop <domain> id attribute
Clean up specification of <name> and <uuid> elements

to work around a schema validation bug on RHEL 6.