Ensure we're importing everything necessary for fallback codepaths too
Ensure we're importing everything necessary for fallback codepaths too

Backporting https://github.com/openshift/origin/pull/3242

marsmensch/atomic-enterprise,miminar/atomic-enterprise,projectatomic/atomic-enterprise,pombredanne/atomic-enterprise,wanghaoran1988/atomic-enterprise,pombredanne/atomic-enterprise,markllama/atomic-enterprise,markllama/atomic-enterprise,projectatomic/atomic-enterprise,miminar/atomic-enterprise,pombredanne/atomic-enterprise,miminar/atomic-enterprise,projectatomic/atomic-enterprise,miminar/atomic-enterprise,marsmensch/atomic-enterprise,markllama/atomic-enterprise,wanghaoran1988/atomic-enterprise,projectatomic/atomic-enterprise,markllama/atomic-enterprise,pombredanne/atomic-enterprise,projectatomic/atomic-enterprise,markllama/atomic-enterprise,marsmensch/atomic-enterprise,projectatomic/atomic-enterprise,wanghaoran1988/atomic-enterprise,marsmensch/atomic-enterprise,miminar/atomic-enterprise,miminar/atomic-enterprise,pombredanne/atomic-enterprise,marsmensch/atomic-enterprise,pombredanne/atomic-enterprise,marsmensch/atomic-enterprise,wanghaoran1988/atomic-enterprise,markllama/atomic-enterprise,wanghaoran1988/atomic-enterprise,wanghaoran1988/atomic-enterprise