Fix failure running `make build test` in cluster/images/etcd
Fix failure running `make build test` in cluster/images/etcd

Change-Id: I5072d06402d211c17c8c5fb952e193bd1e57c07d

andrewsykim/kubernetes,khenidak/kubernetes,PI-Victor/kubernetes,xychu/kubernetes,cblecker/kubernetes,saad-ali/kubernetes,mYmNeo/kubernetes,pweil-/kubernetes,kpgriffith/kubernetes,johscheuer/kubernetes,ping035627/kubernetes,tcnghia/kubernetes,wanghaoran1988/kubernetes,joelsmith/kubernetes,tengqm/kubernetes,Clarifai/kubernetes,mYmNeo/kubernetes,zetaab/kubernetes,mYmNeo/kubernetes,fejta/kubernetes,JacobTanenbaum/kubernetes,xlgao-zju/kubernetes,pires/kubernetes,jessfraz/kubernetes,stevesloka/kubernetes,yarntime/kubernetes,sanjeevm0/kubernetes,xychu/kubernetes,wongma7/kubernetes,mboersma/kubernetes,matthyx/kubernetes,wongma7/kubernetes,soltysh/kubernetes,cmluciano/kubernetes,Clarifai/kubernetes,fgimenez/kubernetes,dereknex/kubernetes,micahhausler/kubernetes,mikebrow/kubernetes,soltysh/kubernetes,zhangmingld/kubernetes,mikedanese/kubernetes,hex108/kubernetes,sanjeevm0/kubernetes,olivierlemasle/kubernetes,mikedanese/kubernetes,mengqiy/kubernetes,ingvagabund/kubernetes,rnaveiras/kubernetes,cadmuxe/kubernetes,k82cn/kubernetes,aveshagarwal/kubernetes,mkumatag/kubernetes,carlory/kubernetes,monopole/kubernetes,MHBauer/kubernetes,deads2k/kubernetes,gnufied/kubernetes,wanghaoran1988/kubernetes,kow3ns/kubernetes,nikhita/kubernetes,li-ang/kubernetes,johscheuer/kubernetes,cofyc/kubernetes,pmorie/kubernetes,u2takey/kubernetes,iameli/kubernetes,enj/kubernetes,mkumatag/kubernetes,brendandburns/kubernetes,ravisantoshgudimetla/kubernetes,andrewsykim/kubernetes,zetaab/kubernetes,cantbewong/kubernetes,dereknex/kubernetes,wanghaoran1988/kubernetes,ixdy/kubernetes,liggitt/kubernetes,weiwei04/kubernetes,ping035627/kubernetes,matthyx/kubernetes,mahak/kubernetes,ixdy/kubernetes,thockin/kubernetes,cblecker/kubernetes,openshift/kubernetes,micahhausler/kubernetes,sethpollack/kubernetes,alejandroEsc/kubernetes,sanjeevm0/kubernetes,mengqiy/kubernetes,nikhita/kubernetes,nckturner/kubernetes,derekwaynecarr/kubernetes,tallclair/kubernetes,olivierlemasle/kubernetes,frodenas/kubernetes,fgimenez/kubernetes,pwittrock/kubernetes,jfrazelle/kubernetes,bizhao/kubernetes,rafax/kubernetes,davidz627/kubernetes,enj/kubernetes,kevensen/kubernetes,shyamjvs/kubernetes,u2takey/kubernetes,csrwng/kubernetes,li-ang/kubernetes,micahhausler/kubernetes,erwinvaneyk/kubernetes,davidz627/kubernetes,stevesloka/kubernetes,warmchang/kubernetes,tomerf/kubernetes,Clarifai/kubernetes,kubernetes/kubernetes,jackfrancis/kubernetes,xlgao-zju/kubernetes,mfojtik/kubernetes,njuicsgz/kubernetes-1,jdef/kubernetes,mYmNeo/kubernetes,MHBauer/kubernetes,chrislovecnm/kubernetes,sdminonne/kubernetes,maciaszczykm/kubernetes,alejandroEsc/kubernetes,derekwaynecarr/kubernetes,k82/kubernetes,Acidburn0zzz/kubernetes,joelsmith/kubernetes,matthyx/kubernetes,andrewsykim/kubernetes,jennybuckley/kubernetes,kitt1987/kubernetes,zetaab/kubernetes,li-ang/kubernetes,tomzhang/kubernetes,lojies/kubernetes,humblec/kubernetes,Acidburn0zzz/kubernetes,coolsvap/kubernetes,fanzhangio/kubernetes,jagosan/kubernetes,jdef/kubernetes,feiskyer/kubernetes,carlory/kubernetes,andrewrynhard/kubernetes,wanghaoran1988/kubernetes,khenidak/kubernetes,tallclair/kubernetes,zhouhaibing089/kubernetes,weiwei04/kubernetes,davidz627/kubernetes,pmorie/kubernetes,nikhita/kubernetes,k82cn/kubernetes,nckturner/kubernetes,linux-on-ibm-z/kubernetes,kitt1987/kubernetes,Clarifai/kubernetes,xychu/kubernetes,bizhao/kubernetes,openshift/kubernetes,JacobTanenbaum/kubernetes,dereknex/kubernetes,Clarifai/kubernetes,cblecker/kubernetes,njuicsgz/kubernetes-1,openshift/kubernetes,liggitt/kubernetes,MikeSpreitzer/kubernetes,pires/kubernetes,du2016/kubernetes,mboersma/kubernetes,yarntime/kubernetes,nikhita/kubernetes,njuicsgz/kubernetes-1,nikhita/kubernetes,spzala/kubernetes,GulajavaMinistudio/kubernetes,lojies/kubernetes,wenlxie/kubernetes,shyamjvs/kubernetes,klaus1982/kubernetes,fgimenez/kubernetes,jessfraz/kubernetes,humblec/kubernetes,njuicsgz/kubernetes-1,ravilr/kubernetes,kow3ns/kubernetes,lojies/kubernetes,verult/kubernetes,derekwaynecarr/kubernetes,aledbf/kubernetes,andrewrynhard/kubernetes,deads2k/kubernetes,rnaveiras/kubernetes,chestack/kubernetes,tcnghia/kubernetes,mYmNeo/kubernetes,alejandroEsc/kubernetes,enj/kubernetes,hex108/kubernetes,mengqiy/kubernetes,LalatenduMohanty/kubernetes,mkumatag/kubernetes,cmluciano/kubernetes,u2takey/kubernetes,jagosan/kubernetes,erwinvaneyk/kubernetes,ii/kubernetes,feiskyer/kubernetes,cantbewong/kubernetes,nckturner/kubernetes,huangjiuyuan/kubernetes,cantbewong/kubernetes,MHBauer/kubernetes,kitt1987/kubernetes,pmorie/kubernetes,wenlxie/kubernetes,kpgriffith/kubernetes,kitt1987/kubernetes,idvoretskyi/kubernetes,MHBauer/kubernetes,fanzhangio/kubernetes,mkumatag/kubernetes,nak3/kubernetes,saad-ali/kubernetes,humblec/kubernetes,pweil-/kubernetes,kevin-wangzefeng/kubernetes,wenlxie/kubernetes,tomerf/kubernetes,bparees/kubernetes,kubernetes/kubernetes,gnufied/kubernetes,monopole/kubernetes,mosoft521/kubernetes,ii/kubernetes,jingxu97/kubernetes,bizhao/kubernetes,njuicsgz/kubernetes-1,ii/kubernetes,spzala/kubernetes,yarntime/kubernetes,jfrazelle/kubernetes,fanzhangio/kubernetes,stevesloka/kubernetes,dlorenc/kubernetes,zhangmingld/kubernetes,rafax/kubernetes,frodenas/kubernetes,kevin-wangzefeng/kubernetes,pweil-/kubernetes,zhouhaibing089/kubernetes,huangjiuyuan/kubernetes,idvoretskyi/kubernetes,rrati/kubernetes,liggitt/kubernetes,pires/kubernetes,warmchang/kubernetes,lichuqiang/kubernetes,du2016/kubernetes,mahak/kubernetes,lojies/kubernetes,rnaveiras/kubernetes,cofyc/kubernetes,roberthbailey/kubernetes,jennybuckley/kubernetes,csrwng/kubernetes,kow3ns/kubernetes,kpgriffith/kubernetes,deads2k/kubernetes,pires/kubernetes,erwinvaneyk/kubernetes,fabriziopandini/kubernetes,verult/kubernetes,ingvagabund/kubernetes,rafax/kubernetes,kevin-wangzefeng/kubernetes,Hui-Zhi/kubernetes,rnaveiras/kubernetes,PiotrProkop/kubernetes,Hui-Zhi/kubernetes,iameli/kubernetes,jennybuckley/kubernetes,cofyc/kubernetes,kevin-wangzefeng/kubernetes,jagosan/kubernetes,cmluciano/kubernetes,joelsmith/kubernetes,ConnorDoyle/kubernetes,feiskyer/kubernetes,xlgao-zju/kubernetes,pwittrock/kubernetes,aledbf/kubernetes,nak3/kubernetes,dlorenc/kubernetes,JacobTanenbaum/kubernetes,andrewrynhard/kubernetes,dixudx/kubernetes,dlorenc/kubernetes,derekwaynecarr/kubernetes,joelsmith/kubernetes,nckturner/kubernetes,xlgao-zju/kubernetes,bizhao/kubernetes,wongma7/kubernetes,x13n/kubernetes,rnaveiras/kubernetes,lichuqiang/kubernetes,mfojtik/kubernetes,u2takey/kubernetes,khenidak/kubernetes,tpepper/kubernetes,ConnorDoyle/kubernetes,humblec/kubernetes,monopole/kubernetes,jennybuckley/kubernetes,fabriziopandini/kubernetes,du2016/kubernetes,fanzhangio/kubernetes,li-ang/kubernetes,olivierlemasle/kubernetes,tpepper/kubernetes,mboersma/kubernetes,jennybuckley/kubernetes,csrwng/kubernetes,wongma7/kubernetes,GulajavaMinistudio/kubernetes,jackfrancis/kubernetes,tallclair/kubernetes,luxas/kubernetes,aledbf/kubernetes,cantbewong/kubernetes,alejandroEsc/kubernetes,fanzhangio/kubernetes,MikeSpreitzer/kubernetes,jingxu97/kubernetes,huangjiuyuan/kubernetes,aveshagarwal/kubernetes,weiwei04/kubernetes,soltysh/kubernetes,krmayankk/kubernetes,yujuhong/kubernetes,LalatenduMohanty/kubernetes,coolsvap/kubernetes,ConnorDoyle/kubernetes,stevesloka/kubernetes,rrati/kubernetes,jdef/kubernetes,erwinvaneyk/kubernetes,mboersma/kubernetes,k82/kubernetes,jdef/kubernetes,johscheuer/kubernetes,hex108/kubernetes,tomzhang/kubernetes,lichuqiang/kubernetes,tcnghia/kubernetes,gnufied/kubernetes,deads2k/kubernetes,fejta/kubernetes,aledbf/kubernetes,mosoft521/kubernetes,ravisantoshgudimetla/kubernetes,iameli/kubernetes,micahhausler/kubernetes,tengqm/kubernetes,chrislovecnm/kubernetes,klaus1982/kubernetes,mboersma/kubernetes,pweil-/kubernetes,verult/kubernetes,MikeSpreitzer/kubernetes,tomzhang/kubernetes,kpgriffith/kubernetes,frodenas/kubernetes,jsafrane/kubernetes,mikedanese/kubernetes,ravilr/kubernetes,maciaszczykm/kubernetes,sdminonne/kubernetes,luxas/kubernetes,mikebrow/kubernetes,carlory/kubernetes,tallclair/kubernetes,mengqiy/kubernetes,pmorie/kubernetes,ingvagabund/kubernetes,verult/kubernetes,sethpollack/kubernetes,dixudx/kubernetes,klaus1982/kubernetes,brendandburns/kubernetes,feiskyer/kubernetes,cblecker/kubernetes,pmorie/kubernetes,aveshagarwal/kubernetes,tpepper/kubernetes,mikedanese/kubernetes,krmayankk/kubernetes,tomzhang/kubernetes,coolsvap/kubernetes,saad-ali/kubernetes,mahak/kubernetes,mahak/kubernetes,u2takey/kubernetes,rafax/kubernetes,kow3ns/kubernetes,iterion/kubernetes,ConnorDoyle/kubernetes,chrislovecnm/kubernetes,fgimenez/kubernetes,x13n/kubernetes,fabriziopandini/kubernetes,yarntime/kubernetes,wenlxie/kubernetes,Acidburn0zzz/kubernetes,cofyc/kubernetes,ping035627/kubernetes,csrwng/kubernetes,bparees/kubernetes,Hui-Zhi/kubernetes,deads2k/kubernetes,jingxu97/kubernetes,joelsmith/kubernetes,jsafrane/kubernetes,stevesloka/kubernetes,iameli/kubernetes,yujuhong/kubernetes,Lion-Wei/kubernetes,BenTheElder/kubernetes,zhouhaibing089/kubernetes,BenTheElder/kubernetes,xlgao-zju/kubernetes,brendandburns/kubernetes,tallclair/kubernetes,nak3/kubernetes,jackfrancis/kubernetes,x13n/kubernetes,saad-ali/kubernetes,krmayankk/kubernetes,dixudx/kubernetes,iterion/kubernetes,k82cn/kubernetes,wongma7/kubernetes,chestack/kubernetes,nak3/kubernetes,micahhausler/kubernetes,ravisantoshgudimetla/kubernetes,idvoretskyi/kubernetes,spzala/kubernetes,krmayankk/kubernetes,liggitt/kubernetes,verb/kubernetes,gnufied/kubernetes,davidz627/kubernetes,chrislovecnm/kubernetes,kubernetes/kubernetes,Acidburn0zzz/kubernetes,gnufied/kubernetes,brendandburns/kubernetes,cadmuxe/kubernetes,PI-Victor/kubernetes,openshift/kubernetes,Clarifai/kubernetes,pires/kubernetes,JacobTanenbaum/kubernetes,jfrazelle/kubernetes,kpgriffith/kubernetes,mikedanese/kubernetes,monopole/kubernetes,jackfrancis/kubernetes,ravilr/kubernetes,luxas/kubernetes,mosoft521/kubernetes,soltysh/kubernetes,wenlxie/kubernetes,mahak/kubernetes,BenTheElder/kubernetes,idvoretskyi/kubernetes,iameli/kubernetes,cofyc/kubernetes,dims/kubernetes,njuicsgz/kubernetes-1,Hui-Zhi/kubernetes,pwittrock/kubernetes,weiwei04/kubernetes,mikebrow/kubernetes,openshift/kubernetes,khenidak/kubernetes,joelsmith/kubernetes,k82/kubernetes,mosoft521/kubernetes,hex108/kubernetes,krmayankk/kubernetes,LalatenduMohanty/kubernetes,kubernetes/kubernetes,mkumatag/kubernetes,jagosan/kubernetes,yujuhong/kubernetes,cmluciano/kubernetes,PI-Victor/kubernetes,iterion/kubernetes,sdminonne/kubernetes,PiotrProkop/kubernetes,mikebrow/kubernetes,tomerf/kubernetes,GulajavaMinistudio/kubernetes,sethpollack/kubernetes,cantbewong/kubernetes,linux-on-ibm-z/kubernetes,fabriziopandini/kubernetes,jsafrane/kubernetes,Lion-Wei/kubernetes,pwittrock/kubernetes,rrati/kubernetes,kow3ns/kubernetes,Acidburn0zzz/kubernetes,fejta/kubernetes,fejta/kubernetes,aveshagarwal/kubernetes,mosoft521/kubernetes,dims/kubernetes,maciaszczykm/kubernetes,huangjiuyuan/kubernetes,mikebrow/kubernetes,warmchang/kubernetes,thockin/kubernetes,tengqm/kubernetes,liggitt/kubernetes,ravilr/kubernetes,coolsvap/kubernetes,jingxu97/kubernetes,erwinvaneyk/kubernetes,fanzhangio/kubernetes,verb/kubernetes,xlgao-zju/kubernetes,sethpollack/kubernetes,andrewrynhard/kubernetes,tomzhang/kubernetes,warmchang/kubernetes,andrewsykim/kubernetes,chestack/kubernetes,zhouhaibing089/kubernetes,mboersma/kubernetes,du2016/kubernetes,fejta/kubernetes,stevesloka/kubernetes,csrwng/kubernetes,k82/kubernetes,sanjeevm0/kubernetes,matthyx/kubernetes,frodenas/kubernetes,tcnghia/kubernetes,mfojtik/kubernetes,li-ang/kubernetes,xychu/kubernetes,bparees/kubernetes,mYmNeo/kubernetes,tomzhang/kubernetes,kubernetes/kubernetes,zetaab/kubernetes,bparees/kubernetes,tcnghia/kubernetes,yarntime/kubernetes,ingvagabund/kubernetes,pmorie/kubernetes,coolsvap/kubernetes,MHBauer/kubernetes,cmluciano/kubernetes,jsafrane/kubernetes,olivierlemasle/kubernetes,jackfrancis/kubernetes,maciaszczykm/kubernetes,iterion/kubernetes,ii/kubernetes,tpepper/kubernetes,khenidak/kubernetes,derekwaynecarr/kubernetes,yujuhong/kubernetes,huangjiuyuan/kubernetes,luxas/kubernetes,shyamjvs/kubernetes,wanghaoran1988/kubernetes,bizhao/kubernetes,PiotrProkop/kubernetes,verult/kubernetes,warmchang/kubernetes,jdef/kubernetes,brendandburns/kubernetes,tcnghia/kubernetes,dereknex/kubernetes,andrewrynhard/kubernetes,PiotrProkop/kubernetes,feiskyer/kubernetes,ixdy/kubernetes,kow3ns/kubernetes,rrati/kubernetes,krmayankk/kubernetes,Acidburn0zzz/kubernetes,ConnorDoyle/kubernetes,u2takey/kubernetes,erwinvaneyk/kubernetes,andrewsykim/kubernetes,maciaszczykm/kubernetes,Hui-Zhi/kubernetes,mengqiy/kubernetes,cofyc/kubernetes,dlorenc/kubernetes,maciaszczykm/kubernetes,coolsvap/kubernetes,roberthbailey/kubernetes,sanjeevm0/kubernetes,LalatenduMohanty/kubernetes,Lion-Wei/kubernetes,PiotrProkop/kubernetes,thockin/kubernetes,saad-ali/kubernetes,ii/kubernetes,zhouhaibing089/kubernetes,andrewsykim/kubernetes,bparees/kubernetes,du2016/kubernetes,iterion/kubernetes,dims/kubernetes,verult/kubernetes,mfojtik/kubernetes,njuicsgz/kubernetes-1,iterion/kubernetes,aveshagarwal/kubernetes,shyamjvs/kubernetes,dlorenc/kubernetes,johscheuer/kubernetes,bizhao/kubernetes,olivierlemasle/kubernetes,jagosan/kubernetes,spzala/kubernetes,thockin/kubernetes,Lion-Wei/kubernetes,tomzhang/kubernetes,x13n/kubernetes,x13n/kubernetes,chrislovecnm/kubernetes,tengqm/kubernetes,JacobTanenbaum/kubernetes,x13n/kubernetes,yarntime/kubernetes,lichuqiang/kubernetes,ping035627/kubernetes,sethpollack/kubernetes,ixdy/kubernetes,cadmuxe/kubernetes,roberthbailey/kubernetes,tpepper/kubernetes,ravisantoshgudimetla/kubernetes,nak3/kubernetes,Lion-Wei/kubernetes,xychu/kubernetes,jessfraz/kubernetes,mfojtik/kubernetes,hex108/kubernetes,tallclair/kubernetes,jennybuckley/kubernetes,kevensen/kubernetes,JacobTanenbaum/kubernetes,idvoretskyi/kubernetes,fejta/kubernetes,kevensen/kubernetes,khenidak/kubernetes,roberthbailey/kubernetes,brendandburns/kubernetes,ConnorDoyle/kubernetes,dereknex/kubernetes,tomerf/kubernetes,carlory/kubernetes,kitt1987/kubernetes,verb/kubernetes,alejandroEsc/kubernetes,derekwaynecarr/kubernetes,PI-Victor/kubernetes,kevin-wangzefeng/kubernetes,klaus1982/kubernetes,kitt1987/kubernetes,zhangmingld/kubernetes,weiwei04/kubernetes,roberthbailey/kubernetes,MikeSpreitzer/kubernetes,tpepper/kubernetes,mboersma/kubernetes,PI-Victor/kubernetes,linux-on-ibm-z/kubernetes,zhangmingld/kubernetes,njuicsgz/kubernetes-1,johscheuer/kubernetes,zetaab/kubernetes,ixdy/kubernetes,thockin/kubernetes,aveshagarwal/kubernetes,GulajavaMinistudio/kubernetes,Hui-Zhi/kubernetes,huangjiuyuan/kubernetes,zetaab/kubernetes,carlory/kubernetes,k82/kubernetes,enj/kubernetes,tengqm/kubernetes,fgimenez/kubernetes,pwittrock/kubernetes,jdef/kubernetes,MHBauer/kubernetes,mboersma/kubernetes,tomerf/kubernetes,lichuqiang/kubernetes,yujuhong/kubernetes,fabriziopandini/kubernetes,tomzhang/kubernetes,kevensen/kubernetes,BenTheElder/kubernetes,jsafrane/kubernetes,cadmuxe/kubernetes,sdminonne/kubernetes,matthyx/kubernetes,wenlxie/kubernetes,mfojtik/kubernetes,MikeSpreitzer/kubernetes,yujuhong/kubernetes,PI-Victor/kubernetes,spzala/kubernetes,k82cn/kubernetes,davidz627/kubernetes,luxas/kubernetes,cadmuxe/kubernetes,frodenas/kubernetes,GulajavaMinistudio/kubernetes,cmluciano/kubernetes,BenTheElder/kubernetes,linux-on-ibm-z/kubernetes,zhangmingld/kubernetes,dims/kubernetes,tomzhang/kubernetes,cadmuxe/kubernetes,ping035627/kubernetes,kpgriffith/kubernetes,aledbf/kubernetes,Lion-Wei/kubernetes,nckturner/kubernetes,frodenas/kubernetes,ixdy/kubernetes,andrewrynhard/kubernetes,hex108/kubernetes,pwittrock/kubernetes,humblec/kubernetes,monopole/kubernetes,dixudx/kubernetes,pweil-/kubernetes,fgimenez/kubernetes,jessfraz/kubernetes,zhangmingld/kubernetes,verb/kubernetes,dims/kubernetes,sdminonne/kubernetes,xychu/kubernetes,ingvagabund/kubernetes,weiwei04/kubernetes,pweil-/kubernetes,cantbewong/kubernetes,lichuqiang/kubernetes,ravisantoshgudimetla/kubernetes,idvoretskyi/kubernetes,wanghaoran1988/kubernetes,shyamjvs/kubernetes,davidz627/kubernetes,chrislovecnm/kubernetes,k82cn/kubernetes,chestack/kubernetes,dixudx/kubernetes,jfrazelle/kubernetes,verb/kubernetes,dereknex/kubernetes,dlorenc/kubernetes,jingxu97/kubernetes,rrati/kubernetes,enj/kubernetes,sanjeevm0/kubernetes,ravilr/kubernetes,lojies/kubernetes,nak3/kubernetes,linux-on-ibm-z/kubernetes,johscheuer/kubernetes,jfrazelle/kubernetes,pires/kubernetes,ingvagabund/kubernetes,saad-ali/kubernetes,cblecker/kubernetes,ravisantoshgudimetla/kubernetes,luxas/kubernetes,soltysh/kubernetes,LalatenduMohanty/kubernetes,kevensen/kubernetes,LalatenduMohanty/kubernetes,tomerf/kubernetes,jessfraz/kubernetes,chestack/kubernetes