Redmine#5556: mix def.acl and def.domain at the source

see https://cfengine.com/dev/issues/5556