Make changes so we can apply #1590
Make changes so we can apply #1590

BradErz/kops,blakebarnett/kops,sethpollack/kops,robinpercy/kops,BradErz/kops,kris-nova/kops,tsupertramp/kops,MadDogTechnology/kops,dacohen/kops,aledbf/kops,chrislovecnm/kops,chrislovecnm/kops,faraazkhan/kops,mad01/kops,kris-nova/kops,andrewsykim/kops,aledbf/kops,DualSpark/kops,leandrocr/kops,robinpercy/kops,reactiveops/kops,BradErz/kops,pdh/kops,blakebarnett/kops,reactiveops/kops,justinsb/kops,justinsb/kops,sethpollack/kops,kubernetes/kops,blakebarnett/kops,WillemMali/kops,pdh/kops,sethpollack/kops,MadDogTechnology/kops,tsupertramp/kops,gambol99/kops,robinpercy/kops,DualSpark/kops,MadDogTechnology/kops,kris-nova/kops,andrewsykim/kops,leandrocr/kops,pdh/kops,chrislovecnm/kops,DualSpark/kops,mad01/kops,gambol99/kops,andrewsykim/kops,chrislovecnm/kops,WillemMali/kops,austinmoore-/kops,dacohen/kops,gambol99/kops,sethpollack/kops,tsupertramp/kops,WillemMali/kops,aledbf/kops,austinmoore-/kops,DualSpark/kops,kris-nova/kops,austinmoore-/kops,austinmoore-/kops,justinsb/kops,robinpercy/kops,kubernetes/kops,faraazkhan/kops,tsupertramp/kops,reactiveops/kops,blakebarnett/kops,pdh/kops,MadDogTechnology/kops,faraazkhan/kops,dacohen/kops,gambol99/kops,andrewsykim/kops,reactiveops/kops,dacohen/kops,mad01/kops,aledbf/kops,kubernetes/kops,mad01/kops,BradErz/kops,leandrocr/kops,leandrocr/kops,faraazkhan/kops,WillemMali/kops