Remove max domains
Merge pull request #4089 from liggitt/remove_max_domains

Merged by openshift-bot
splitting runtime tests