Fix bug 1030774: domain info overflow
Merge pull request #4205 from liggitt/bug_1030774_domain_info_overflow

Merged by openshift-bot