[SECURITY-412] Simplify implementation as suggested by jglick
[SECURITY-412] Simplify implementation as suggested by jglick

ErikVerheul/jenkins,viqueen/jenkins,lilyJi/jenkins,ikedam/jenkins,dariver/jenkins,tangkun75/jenkins,dariver/jenkins,escoem/jenkins,MarkEWaite/jenkins,damianszczepanik/jenkins,DanielWeber/jenkins,sathiya-mit/jenkins,tangkun75/jenkins,oleg-nenashev/jenkins,kohsuke/hudson,ndeloof/jenkins,andresrc/jenkins,Ykus/jenkins,jenkinsci/jenkins,tfennelly/jenkins,damianszczepanik/jenkins,hplatou/jenkins,batmat/jenkins,wuwen5/jenkins,Ykus/jenkins,patbos/jenkins,damianszczepanik/jenkins,kohsuke/hudson,MarkEWaite/jenkins,bkmeneguello/jenkins,stephenc/jenkins,stephenc/jenkins,pjanouse/jenkins,bpzhang/jenkins,Jimilian/jenkins,v1v/jenkins,kohsuke/hudson,pjanouse/jenkins,escoem/jenkins,tfennelly/jenkins,amuniz/jenkins,ErikVerheul/jenkins,Jimilian/jenkins,batmat/jenkins,ikedam/jenkins,escoem/jenkins,hplatou/jenkins,Jimilian/jenkins,lilyJi/jenkins,lilyJi/jenkins,Jimilian/jenkins,tfennelly/jenkins,viqueen/jenkins,Jimilian/jenkins,rsandell/jenkins,amuniz/jenkins,recena/jenkins,fbelzunc/jenkins,ErikVerheul/jenkins,amuniz/jenkins,Jochen-A-Fuerbacher/jenkins,godfath3r/jenkins,damianszczepanik/jenkins,fbelzunc/jenkins,ErikVerheul/jenkins,jenkinsci/jenkins,daniel-beck/jenkins,kohsuke/hudson,tangkun75/jenkins,hplatou/jenkins,azweb76/jenkins,viqueen/jenkins,kohsuke/hudson,Jimilian/jenkins,dariver/jenkins,ndeloof/jenkins,aldaris/jenkins,Vlatombe/jenkins,ndeloof/jenkins,godfath3r/jenkins,Ykus/jenkins,DanielWeber/jenkins,bpzhang/jenkins,damianszczepanik/jenkins,bkmeneguello/jenkins,bpzhang/jenkins,kohsuke/hudson,azweb76/jenkins,Jochen-A-Fuerbacher/jenkins,Vlatombe/jenkins,lilyJi/jenkins,oleg-nenashev/jenkins,patbos/jenkins,ndeloof/jenkins,ErikVerheul/jenkins,batmat/jenkins,DanielWeber/jenkins,aldaris/jenkins,DanielWeber/jenkins,Vlatombe/jenkins,tfennelly/jenkins,sathiya-mit/jenkins,azweb76/jenkins,bkmeneguello/jenkins,stephenc/jenkins,jenkinsci/jenkins,fbelzunc/jenkins,recena/jenkins,oleg-nenashev/jenkins,daniel-beck/jenkins,escoem/jenkins,recena/jenkins,patbos/jenkins,Jochen-A-Fuerbacher/jenkins,bpzhang/jenkins,godfath3r/jenkins,hplatou/jenkins,rsandell/jenkins,sathiya-mit/jenkins,tangkun75/jenkins,hplatou/jenkins,patbos/jenkins,kohsuke/hudson,ndeloof/jenkins,aldaris/jenkins,damianszczepanik/jenkins,escoem/jenkins,Vlatombe/jenkins,rsandell/jenkins,patbos/jenkins,wuwen5/jenkins,pjanouse/jenkins,viqueen/jenkins,jenkinsci/jenkins,dariver/jenkins,DanielWeber/jenkins,tfennelly/jenkins,amuniz/jenkins,aldaris/jenkins,Jochen-A-Fuerbacher/jenkins,v1v/jenkins,kohsuke/hudson,daniel-beck/jenkins,MarkEWaite/jenkins,Vlatombe/jenkins,hplatou/jenkins,azweb76/jenkins,ikedam/jenkins,wuwen5/jenkins,stephenc/jenkins,ikedam/jenkins,recena/jenkins,Vlatombe/jenkins,v1v/jenkins,azweb76/jenkins,patbos/jenkins,patbos/jenkins,ikedam/jenkins,tangkun75/jenkins,tfennelly/jenkins,jenkinsci/jenkins,Ykus/jenkins,lilyJi/jenkins,wuwen5/jenkins,fbelzunc/jenkins,recena/jenkins,lilyJi/jenkins,godfath3r/jenkins,dariver/jenkins,pjanouse/jenkins,ErikVerheul/jenkins,recena/jenkins,sathiya-mit/jenkins,DanielWeber/jenkins,escoem/jenkins,ndeloof/jenkins,jenkinsci/jenkins,MarkEWaite/jenkins,rsandell/jenkins,wuwen5/jenkins,daniel-beck/jenkins,bkmeneguello/jenkins,batmat/jenkins,daniel-beck/jenkins,azweb76/jenkins,escoem/jenkins,stephenc/jenkins,Jimilian/jenkins,tangkun75/jenkins,bpzhang/jenkins,andresrc/jenkins,andresrc/jenkins,rsandell/jenkins,stephenc/jenkins,DanielWeber/jenkins,andresrc/jenkins,recena/jenkins,aldaris/jenkins,lilyJi/jenkins,hplatou/jenkins,Jochen-A-Fuerbacher/jenkins,tangkun75/jenkins,batmat/jenkins,pjanouse/jenkins,damianszczepanik/jenkins,v1v/jenkins,Ykus/jenkins,pjanouse/jenkins,aldaris/jenkins,ikedam/jenkins,Jochen-A-Fuerbacher/jenkins,pjanouse/jenkins,Ykus/jenkins,ikedam/jenkins,bkmeneguello/jenkins,MarkEWaite/jenkins,oleg-nenashev/jenkins,wuwen5/jenkins,oleg-nenashev/jenkins,andresrc/jenkins,MarkEWaite/jenkins,Ykus/jenkins,rsandell/jenkins,azweb76/jenkins,jenkinsci/jenkins,batmat/jenkins,andresrc/jenkins,fbelzunc/jenkins,ikedam/jenkins,v1v/jenkins,sathiya-mit/jenkins,bkmeneguello/jenkins,dariver/jenkins,v1v/jenkins,aldaris/jenkins,jenkinsci/jenkins,daniel-beck/jenkins,bpzhang/jenkins,viqueen/jenkins,sathiya-mit/jenkins,amuniz/jenkins,tfennelly/jenkins,sathiya-mit/jenkins,fbelzunc/jenkins,wuwen5/jenkins,fbelzunc/jenkins,rsandell/jenkins,daniel-beck/jenkins,amuniz/jenkins,godfath3r/jenkins,oleg-nenashev/jenkins,viqueen/jenkins,damianszczepanik/jenkins,godfath3r/jenkins,daniel-beck/jenkins,ndeloof/jenkins,batmat/jenkins,ErikVerheul/jenkins,bkmeneguello/jenkins,viqueen/jenkins,oleg-nenashev/jenkins,Vlatombe/jenkins,bpzhang/jenkins,rsandell/jenkins,MarkEWaite/jenkins,dariver/jenkins,amuniz/jenkins,andresrc/jenkins,godfath3r/jenkins,v1v/jenkins,stephenc/jenkins,Jochen-A-Fuerbacher/jenkins,MarkEWaite/jenkins