Remove max domains
Fix bug 1004649
Merge pull request #4090 from pmorie/bugs/1004649

Fix bug 1004649
spliting runtime components
Merge pull request #4089 from liggitt/remove_max_domains

Merged by openshift-bot