BZ1120897 fixes
Merge pull request #5641 from CowboysFan/bug_1120897

Merged by openshift-bot