Card 536 - Clean up in domain space
Merge pull request #1957 from lnader/536

Merged by openshift-bot