Reverting fix for bug 973718
Reinstating fix for bug 974507
Merge pull request #2870 from abhgupta/stage_revert_fix_973718

Merged by openshift-bot
Automatic commit of package [rubygem-openshift-origin-controller] release [1.9.17-1].