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

Fixes #3236

rrati/origin,matthyx/origin,spohnan/origin,ironcladlou/origin,barrett-vegas-com/origin,ashcrow/origin,nitintutlani/origin,pkdevbox/origin,miminar/origin,robertol/origin,jwhonce/origin,legionus/origin,myfear/origin,pgmcd/origin,seveillac/origin,lorenzogm/openshift-origin,jpeeler/origin,ramr/origin,markllama/origin,samsong8610/origin,chlunde/origin,rafabene/origin,inlandsee/origin,adietish/origin,craigmunro/origin,senayar/origin,barrett-vegas-com/origin,christian-posta/origin,liangxia/origin,tracyrankin/origin,raffaelespazzoli/origin,jhadvig/origin,Miciah/origin,goern/origin,ibotty/origin,php-coder/origin,stackdocker/origin,mrogers950/origin,levivic/origin,ocsbrandon/origin,EricMountain-1A/openshift-origin,pacoja84/origin,miminar/origin,smunilla/origin,inlandsee/origin,dgoodwin/origin,Jandersolutions/origin,dgoodwin/origin,zofuthan/origin,lorenzogm/openshift-origin,jhadvig/origin,dustintownsend/origin,hferentschik/origin,jwhonce/origin,goern/origin,benjaminapetersen/origin,maxamillion/origin,rusenask/origin,dcbw/origin,luciddreamz/origin,knobunc/origin,romanbartl/origin,tnguyen-rh/origin,smarterclayton/origin,jhadvig/origin,jwhonce/origin,romanbartl/origin,rusenask/origin,yarko/origin,Tlacenka/origin,YannMoisan/origin,robertol/origin,liangxia/origin,quantiply-fork/origin,jhadvig/origin,imcsk8/origin,kargakis/origin,markllama/origin,jhammant/origin,ravisantoshgudimetla/origin,fabianofranz/origin,benjaminapetersen/origin,pecameron/origin,raffaelespazzoli/origin,jwhonce/origin,craigmunro/origin,lixueclaire/origin,rajkotecha/origin,mfisher-rht/origin,markllama/origin,ingvagabund/origin,nitintutlani/origin,louyihua/origin,ryanj/origin,childsb/origin,enj/origin,eparis/origin,nak3/origin,miminar/origin,rhuss/origin,spadgett/origin,sseago/origin,aweiteka/origin,rajatchopra/origin,linearregression/origin,mrogers950/origin,xiuwang/origin,janetkuo/origin,ejemba/origin,smarterclayton/origin,detiber/origin,dcbw/origin,tdawson/origin,jhadvig/origin,romanbartl/origin,gruiz17/origin,mnagy/origin,gashcrumb/origin,rhamilto/origin,joshuawilson/origin,ncdc/origin,thesteve0/origin,EricMountain-1A/openshift-origin,asiainfoLDP/datafactory,tjcunliffe/origin,chlunde/origin,rhamilto/origin,StevenLudwig/origin,wjiangjay/origin,mfisher-rht/origin,tjanez/origin,gesrat-cisco/origin,jupierce/origin,sgallagher/origin,adelton/origin,vongalpha/origin,jim-minter/origin,janetkuo/origin,pkdevbox/origin,childsb/origin,sseago/origin,Nick-Harvey/origin,Tlacenka/origin,Jandersolutions/origin,tagoh/origin,ryanj/origin,linux-on-ibm-z/origin,tagoh/origin,wyue-redhat/origin,christian-posta/origin,sgallagher/origin,sdminonne/origin,zhaosijun/origin,pacoja84/origin,robertol/origin,elyscape/origin,markllama/origin,pravisankar/origin,allevo/origin,ibotty/origin,liggitt/origin,pacoja84/origin,senayar/origin,spadgett/origin,sferich888/origin,smunilla/origin,pgmcd/origin,ironcladlou/origin,levivic/origin,mingderwang/origin,ryanj/origin,wyue-redhat/origin,dcrisan/origin,mahak/origin,dmage/origin,benjaminapetersen/origin,kargakis/origin,markllama/origin,ocsbrandon/origin,christian-posta/origin,dustintownsend/origin,spinolacastro/origin,Nick-Harvey/origin,aveshagarwal/origin,danmcp/origin,christian-posta/origin,maxamillion/origin,rhcarvalho/origin,ncdc/origin,rajkotecha/origin,dobbymoodge/origin,wjiangjay/origin,wyue-redhat/origin,dcrisan/origin,dcrisan/origin,jupierce/origin,arilivigni/origin,dcbw/origin,tjcunliffe/origin,tiwillia/origin,asiainfoLDP/datafactory,mfojtik/origin,mrogers950/origin,maxamillion/origin,marun/origin,bowenha2/origin,spinolacastro/origin,ryanj/origin,linearregression/origin,jhammant/origin,pecameron/origin,rajatchopra/origin,sallyom/origin,ramr/origin,soltysh/origin,seveillac/origin,rootfs/origin,janetkuo/origin,anpingli/origin,jhadvig/origin,robertol/origin,Jandersoft/origin,swizzley/origin,zhaosijun/origin,greyfairer/openshift-origin,coreydaley/origin,samsong8610/origin,tagoh/origin,domenicbove/origin,rrati/origin,mfisher-rht/origin,maxamillion/origin,yarko/origin,joshuawilson/origin,jpeeler/origin,chlunde/origin,linzhaoming/origin,csrwng/origin,yepengxj/df,akram/origin,thesteve0/origin,xuant/origin,PI-Victor/origin,spinolacastro/origin,wanghaoran1988/origin,yepengxj/df,StevenLudwig/origin,hferentschik/origin,aveshagarwal/origin,levivic/origin,simo5/origin,quantiply-fork/origin,deads2k/origin,aweiteka/origin,Jandersoft/origin,kargakis/origin,myfear/origin,ashcrow/origin,mnagy/origin,ravisantoshgudimetla/origin,linzhaoming/origin,lixueclaire/origin,pmorie/origin,StevenLudwig/origin,luciddreamz/origin,PI-Victor/origin,stevekuznetsov/origin,liangxia/origin,mrogers950/origin,dinhxuanvu/origin,willmtemple/origin,wanghaoran1988/origin,linux-on-ibm-z/origin,swizzley/origin,jeffvance/origin,quantiply-fork/origin,y0no/origin,matthyx/origin,enj/origin,jim-minter/origin,pkdevbox/origin,dmage/origin,simo5/origin,mfisher-rht/origin,linux-on-ibm-z/origin,gesrat-cisco/origin,mrogers950/origin,tdawson/origin,jwforres/origin,dcbw/origin,biyiklioglu/origin,maleck13/origin,joshuawilson/origin,bowenha2/origin,arilivigni/origin,imcsk8/origin,abutcher/origin,ramr/origin,dkorn/origin,zhaosijun/origin,ejemba/origin,joshuawilson/origin,akram/origin,tnozicka/origin,ocsbrandon/origin,sallyom/origin,rafabene/origin,tagoh/origin,vongalpha/origin,burmanm/origin,wanghaoran1988/origin,elyscape/origin,thesteve0/origin,adietish/origin,stackdocker/origin,chmouel/origin,zofuthan/origin,childsb/origin,moolitayer/origin,anpingli/origin,tracyrankin/origin,dgoodwin/origin,mkumatag/origin,Jandersoft/origin,tnozicka/origin,matthyx/origin,wyue-redhat/origin,luciddreamz/origin,louyihua/origin,gruiz17/origin,adietish/origin,burmanm/origin,stackdocker/origin,YannMoisan/origin,danwinship/origin,StevenLudwig/origin,tjanez/origin,fkirill/origin,craigmunro/origin,PI-Victor/origin,willmtemple/origin,pkdevbox/origin,danmcp/origin,sseago/origin,soltysh/origin,dcrisan/origin,smarterclayton/origin,rhuss/origin,danmcp/origin,dcbw/origin,swizzley/origin,mdshuai/origin,jdnieto/origin,openshift/origin,jsafrane/origin,mahak/origin,smarterclayton/origin,rhamilto/origin,thesteve0/origin,danwinship/origin,pravisankar/origin,rajkotecha/origin,ncdc/origin,y0no/origin,rusenask/origin,markllama/origin,linearregression/origin,juanvallejo/origin,dustintownsend/origin,arilivigni/origin,detiber/origin,adelton/origin,Nick-Harvey/origin,rootfs/origin,jdnieto/origin,ejemba/origin,marun/origin,rhcarvalho/origin,spadgett/origin,sspeiche/origin,grdryn/origin,rootfs/origin,allevo/origin,danwinship/origin,fkirill/origin,gruiz17/origin,tjcunliffe/origin,luciddreamz/origin,tjcunliffe/origin,pacoja84/origin,deads2k/origin,sspeiche/origin,luciddreamz/origin,eparis/origin,maxamillion/origin,juanvallejo/origin,liangxia/origin,tagoh/origin,xuant/origin,ibotty/origin,fkirill/origin,allevo/origin,adelton/origin,rusenask/origin,samsong8610/origin,samsong8610/origin,pmorie/origin,vongalpha/origin,sgallagher/origin,stevekuznetsov/origin,linux-on-ibm-z/origin,moolitayer/origin,sg00dwin/origin,stackdocker/origin,imcsk8/origin,Jandersoft/origin,rhuss/origin,christian-posta/origin,tnguyen-rh/origin,pmorie/origin,allevo/origin,thrasher-redhat/origin,smarterclayton/origin,aveshagarwal/origin,tnozicka/origin,christian-posta/origin,ryanj/origin,sjug/origin,fabianofranz/origin,chmouel/origin,danwinship/origin,gesrat-cisco/origin,gabemontero/origin,adietish/origin,danwinship/origin,tnozicka/origin,jdnieto/origin,stackdocker/origin,jhammant/origin,Tlacenka/origin,matthyx/origin,knobunc/origin,tnozicka/origin,tracyrankin/origin,mfisher-rht/origin,pgmcd/origin,Nick-Harvey/origin,pravisankar/origin,jprukner/origin,rhamilto/origin,nhr/origin,jeremyeder/origin,mingderwang/origin,thrasher-redhat/origin,jwhonce/origin,mnagy/origin,xuant/origin,seveillac/origin,lixueclaire/origin,raffaelespazzoli/origin,tnguyen-rh/origin,liggitt/origin,jeremyeder/origin,grdryn/origin,wanghaoran1988/origin,rusenask/origin,barrett-vegas-com/origin,sferich888/origin,dinhxuanvu/origin,php-coder/origin,coreydaley/origin,barrett-vegas-com/origin,hroyrh/origin,rajkotecha/origin,fabianofranz/origin,jwforres/origin,jim-minter/origin,liggitt/origin,xuant/origin,jwforres/origin,jdnieto/origin,wanghaoran1988/origin,ocsbrandon/origin,mdshuai/origin,yepengxj/df,legionus/origin,pweil-/origin,y0no/origin,php-coder/origin,grdryn/origin,simo5/origin,rajatchopra/origin,legionus/origin,jeremyeder/origin,jprukner/origin,mnagy/origin,smunilla/origin,juanvallejo/origin,mdshuai/origin,ryanj/origin,chmouel/origin,janetkuo/origin,rusenask/origin,rhuss/origin,jwforres/origin,spadgett/origin,maleck13/origin,pgmcd/origin,akram/origin,swizzley/origin,mahak/origin,louyihua/origin,lorenzogm/openshift-origin,marun/origin,csrwng/origin,dobbymoodge/origin,abutcher/origin,zofuthan/origin,aweiteka/origin,levivic/origin,rhcarvalho/origin,asiainfoLDP/datafactory,samsong8610/origin,myfear/origin,sseago/origin,quantiply-fork/origin,yarko/origin,willmtemple/origin,domenicbove/origin,ashcrow/origin,EricMountain-1A/openshift-origin,dkorn/origin,mnagy/origin,linux-on-ibm-z/origin,sjug/origin,juanvallejo/origin,PI-Victor/origin,ashcrow/origin,abutcher/origin,pgmcd/origin,kargakis/origin,smunilla/origin,Tlacenka/origin,domenicbove/origin,wjiangjay/origin,domenicbove/origin,seveillac/origin,fkirill/origin,pkdevbox/origin,jeffvance/origin,jprukner/origin,benjaminapetersen/origin,louyihua/origin,janetkuo/origin,pweil-/origin,robertol/origin,joshuawilson/origin,JacobTanenbaum/origin,JacobTanenbaum/origin,jwforres/origin,rajkotecha/origin,jeremyeder/origin,liggitt/origin,ocsbrandon/origin,chmouel/origin,legionus/origin,matthyx/origin,inlandsee/origin,mingderwang/origin,childsb/origin,liggitt/origin,greyfairer/openshift-origin,rrati/origin,dinhxuanvu/origin,ravisantoshgudimetla/origin,jsafrane/origin,yepengxj/df,sspeiche/origin,vongalpha/origin,rajatchopra/origin,bowenha2/origin,mfojtik/origin,rajkotecha/origin,csrwng/origin,stackdocker/origin,jprukner/origin,burmanm/origin,sg00dwin/origin,PI-Victor/origin,childsb/origin,gruiz17/origin,dobbymoodge/origin,sg00dwin/origin,dkorn/origin,jhammant/origin,nitintutlani/origin,romanbartl/origin,zofuthan/origin,Miciah/origin,openshift/origin,moolitayer/origin,tjanez/origin,ingvagabund/origin,Tlacenka/origin,rchicoli/openshift-origin,xiuwang/origin,juanvallejo/origin,tjanez/origin,xiuwang/origin,fkirill/origin,rchicoli/openshift-origin,marun/origin,mfisher-rht/origin,kargakis/origin,rafabene/origin,miminar/origin,asiainfoLDP/datafactory,stevekuznetsov/origin,lorenzogm/openshift-origin,mdshuai/origin,nak3/origin,aweiteka/origin,jpeeler/origin,tnozicka/origin,tiwillia/origin,juanvallejo/origin,tnguyen-rh/origin,detiber/origin,nak3/origin,jeffvance/origin,ibotty/origin,mdshuai/origin,lorenzogm/openshift-origin,rajatchopra/origin,liangxia/origin,gashcrumb/origin,detiber/origin,dustintownsend/origin,barrett-vegas-com/origin,rajatchopra/origin,tiwillia/origin,bowenha2/origin,imcsk8/origin,luciddreamz/origin,pkdevbox/origin,bparees/origin,sgallagher/origin,YannMoisan/origin,ibotty/origin,ocsbrandon/origin,arilivigni/origin,allevo/origin,willmtemple/origin,detiber/origin,myfear/origin,zofuthan/origin,adietish/origin,danwinship/origin,pecameron/origin,liangxia/origin,jeremyeder/origin,tdawson/origin,dustintownsend/origin,nhr/origin,zofuthan/origin,xuant/origin,spohnan/origin,jpeeler/origin,Jandersolutions/origin,gashcrumb/origin,mfojtik/origin,gruiz17/origin,elyscape/origin,Jandersolutions/origin,dgoodwin/origin,linzhaoming/origin,thesteve0/origin,elyscape/origin,burmanm/origin,hroyrh/origin,myfear/origin,miminar/origin,StevenLudwig/origin,abutcher/origin,adietish/origin,jsafrane/origin,enj/origin,pacoja84/origin,Miciah/origin,jprukner/origin,childsb/origin,openshift/origin,gesrat-cisco/origin,myfear/origin,php-coder/origin,fabianofranz/origin,swizzley/origin,maleck13/origin,romanbartl/origin,rafabene/origin,goern/origin,aweiteka/origin,biyiklioglu/origin,quantiply-fork/origin,nitintutlani/origin,liggitt/origin,dustintownsend/origin,dcrisan/origin,tnguyen-rh/origin,jdnieto/origin,elyscape/origin,danmcp/origin,hferentschik/origin,sg00dwin/origin,spohnan/origin,biyiklioglu/origin,louyihua/origin,sferich888/origin,nhr/origin,dobbymoodge/origin,senayar/origin,spinolacastro/origin,jwhonce/origin,xuant/origin,y0no/origin,rhcarvalho/origin,jhammant/origin,barrett-vegas-com/origin,nitintutlani/origin,spinolacastro/origin,dmage/origin,sdminonne/origin,aveshagarwal/origin,rafabene/origin,YannMoisan/origin,nhr/origin,ibotty/origin,legionus/origin,goern/origin,rootfs/origin,bowenha2/origin,jupierce/origin,jeffvance/origin,vongalpha/origin,janetkuo/origin,robertol/origin,Tlacenka/origin,bparees/origin,anpingli/origin,wjiangjay/origin,rchicoli/openshift-origin,dinhxuanvu/origin,mkumatag/origin,benjaminapetersen/origin,rafabene/origin,rrati/origin,adelton/origin,php-coder/origin,mnagy/origin,stevekuznetsov/origin,tjanez/origin,ejemba/origin,swizzley/origin,YannMoisan/origin,aveshagarwal/origin,seveillac/origin,dmage/origin,ramr/origin,yarko/origin,Nick-Harvey/origin,sspeiche/origin,eparis/origin,moolitayer/origin,ashcrow/origin,ravisantoshgudimetla/origin,spohnan/origin,pmorie/origin,yarko/origin,EricMountain-1A/openshift-origin,thrasher-redhat/origin,gruiz17/origin,JacobTanenbaum/origin,hroyrh/origin,smunilla/origin,lixueclaire/origin,pgmcd/origin,linzhaoming/origin,jprukner/origin,lixueclaire/origin,biyiklioglu/origin,sseago/origin,craigmunro/origin,ramr/origin,Jandersoft/origin,tjcunliffe/origin,jhammant/origin,tnguyen-rh/origin,zhaosijun/origin,StevenLudwig/origin,y0no/origin,Jandersolutions/origin,dcrisan/origin,smunilla/origin,lorenzogm/openshift-origin,maleck13/origin,seveillac/origin,linearregression/origin,spohnan/origin,jwforres/origin,moolitayer/origin,wjiangjay/origin,rootfs/origin,kargakis/origin,YannMoisan/origin,jupierce/origin,tdawson/origin,grdryn/origin,dgoodwin/origin,hferentschik/origin,y0no/origin,EricMountain-1A/openshift-origin,ejemba/origin,thrasher-redhat/origin,ravisantoshgudimetla/origin,ejemba/origin,dobbymoodge/origin,knobunc/origin,mrogers950/origin,biyiklioglu/origin,eparis/origin,allevo/origin,senayar/origin,tracyrankin/origin,spinolacastro/origin,tiwillia/origin,mingderwang/origin,abutcher/origin,deads2k/origin,jpeeler/origin,ingvagabund/origin,gesrat-cisco/origin,dkorn/origin,linux-on-ibm-z/origin,tjcunliffe/origin,asiainfoLDP/datafactory,bowenha2/origin,rhcarvalho/origin,EricMountain-1A/openshift-origin,lixueclaire/origin,pravisankar/origin,bparees/origin,spohnan/origin,jdnieto/origin,coreydaley/origin,dkorn/origin,mdshuai/origin,gabemontero/origin,benjaminapetersen/origin,thesteve0/origin,greyfairer/openshift-origin,craigmunro/origin,sdminonne/origin,spadgett/origin,jupierce/origin,dobbymoodge/origin,burmanm/origin,aweiteka/origin,levivic/origin,gesrat-cisco/origin,gabemontero/origin,nhr/origin,sjug/origin,burmanm/origin,rhamilto/origin,tagoh/origin,samsong8610/origin,tjanez/origin,rhuss/origin,linzhaoming/origin,domenicbove/origin,ashcrow/origin,joshuawilson/origin,sseago/origin,nitintutlani/origin,dinhxuanvu/origin,dkorn/origin,raffaelespazzoli/origin,imcsk8/origin,wyue-redhat/origin,inlandsee/origin,mkumatag/origin,craigmunro/origin,hferentschik/origin,pmorie/origin,levivic/origin,ncdc/origin,mingderwang/origin,pweil-/origin,vongalpha/origin,adelton/origin,sallyom/origin,mingderwang/origin,asiainfoLDP/datafactory,Jandersolutions/origin,greyfairer/openshift-origin,soltysh/origin,wyue-redhat/origin,ironcladlou/origin,romanbartl/origin,rrati/origin,biyiklioglu/origin,knobunc/origin,imcsk8/origin,grdryn/origin,pravisankar/origin,hferentschik/origin,miminar/origin,Jandersoft/origin,simo5/origin,wjiangjay/origin,fkirill/origin,quantiply-fork/origin,Nick-Harvey/origin,chlunde/origin,greyfairer/openshift-origin,pacoja84/origin,rhuss/origin,domenicbove/origin,PI-Victor/origin,moolitayer/origin,yarko/origin,greyfairer/openshift-origin,senayar/origin,simo5/origin,grdryn/origin,senayar/origin,gashcrumb/origin,php-coder/origin,rchicoli/openshift-origin