Resolve merge conflict with mixlib-shellout change
Resolve merge conflict with mixlib-shellout change

martinisoft/chef,EasonYi/chef,renanvicente/chef,Kast0rTr0y/chef,AndyBoucher/Chef-Testing,ranjib/chef,grubernaut/chef,Ppjet6/chef,joemiller/chef,swalberg/chef,baberthal/chef,renanvicente/chef,mikefaille/chef,robmul/chef,skmichaelson/chef,legal90/chef,evan2645/chef,nguyen-tien-mulodo/chef,faspl/chef,kaznishi/chef,kaznishi/chef,zuazo-forks/chef,zshuo/chef,mal/chef,nguyen-tien-mulodo/chef,EasonYi/chef,skmichaelson/chef,Igorshp/chef,paulmooring/chef,martinb3/chef,renanvicente/chef,h4ck3rm1k3/chef,tbriggs-curse/chef,clintoncwolfe/chef,polamjag/chef,baberthal/chef,Kast0rTr0y/chef,cmluciano/chef,gene1wood/chef,joemiller/chef,lamont-granquist/chef,evan2645/chef,patcon/chef,jagdeesh109/chef,karthikrev/chef,juliandunn/chef,zshuo/chef,tomdoherty/chef,AndyBoucher/Chef-Testing,sysbot/chef,tbunnyman/chef,gsaslis/chef,swalberg/chef,docwhat/chef,strangelittlemonkey/chef,acaiafa/chef,mattray/chef,faspl/chef,DeWaRs1206/chef,brettcave/chef,gsaslis/chef,zshuo/chef,robmul/chef,webframp/chef,gene1wood/chef,mal/chef,josb/chef,h4ck3rm1k3/chef,paulmooring/chef,jagdeesh109/chef,chef/chef,BackSlasher/chef,pburkholder/chef,ducthanh/chef,jimmymccrory/chef,antonifs/chef,erkolson/chef,jk47/chef,OpSitters/chef,brettcave/chef,jaymzh/chef,h4ck3rm1k3/chef,3dinfluence/chef,cgvarela/chef,nalingarg2/chef-1,gene1wood/chef,brettcave/chef,ktpan/chef-play,gsaslis/chef,pburkholder/chef,legal90/chef,tbunnyman/chef,kaznishi/chef,ckaushik/chef,jordane/chef,OpSitters/chef,jonlives/chef,Kast0rTr0y/chef,jordane/chef,docwhat/chef,jkerry/chef,andrewpsp/chef,nvwls/chef,karthikrev/chef,martinisoft/chef,swalberg/chef,3dinfluence/chef,cmluciano/chef,karthikrev/chef,mikedodge04/chef,someara/chef,ChaosCloud/chef,adamleff/chef,sempervictus/chef,paulmooring/chef,gene1wood/chef,strangelittlemonkey/chef,circleback/chef,Igorshp/chef,ChaosCloud/chef,ktpan/chef-play,brettcave/chef,andrewpsp/chef,nguyen-tien-mulodo/chef,zshuo/chef,grubernaut/chef,nellshamrell/chef,strangelittlemonkey/chef,ranjib/chef,clintoncwolfe/chef,MichaelPereira/chef,cachamber/chef,tomdoherty/chef,chef/chef,oclaussen/chef,nathwill/chef,ckaushik/chef,adamleff/chef,MsysTechnologiesllc/chef,BackSlasher/chef,Tensibai/chef,ktpan/chef-play,ccope/chef,youngjl1/chef,jordane/chef,paulmooring/chef,adamleff/chef,polamjag/chef,martinisoft/chef,nellshamrell/chef,smurawski/chef,jblaine/chef,ChaosCloud/chef,Ppjet6/chef,nvwls/chef,mwrock/chef,pburkholder/chef,higanworks/chef,ckaushik/chef,ChaosCloud/chef,renanvicente/chef,martinb3/chef,mwrock/chef,martinb3/chef,ekometti/chef,jk47/chef,permyakovsv/chef,jmhardison/chef,gsaslis/chef,andrewpsp/chef,polamjag/chef,AndyBoucher/Chef-Testing,ducthanh/chef,jmhardison/chef,tbunnyman/chef,webframp/chef,zshuo/chef,higanworks/chef,custora/chef,AndyBoucher/Chef-Testing,joemiller/chef,sekrett/chef,tbriggs-curse/chef,ccsplit/chef,pburkholder/chef,kaznishi/chef,tbriggs-curse/chef,josb/chef,sanditiffin/chef,swalberg/chef,jonlives/chef,cachamber/chef,EasonYi/chef,aaron-lane/chef,askl56/chef,b002368/chef-repo,jblaine/chef,natewalck/chef,faspl/chef,Igorshp/chef,jaymzh/chef,danielsdeleo/seth,MichaelPereira/chef,bahamas10/chef,cmluciano/chef,sysbot/chef,jblaine/chef,renanvicente/chef,criteo-forks/chef,mwrock/chef,nellshamrell/chef,Igorshp/chef,martinb3/chef,onlyhavecans/chef,criteo-forks/chef,antonifs/chef,jmhardison/chef,nicklv/chef,mio-g/chef,MichaelPereira/chef,mikedodge04/chef,juliandunn/chef,malisettirammurthy/chef,higanworks/chef,baberthal/chef,nguyen-tien-mulodo/chef,clintoncwolfe/chef,pburkholder/chef,erkolson/chef,nicklv/chef,mal/chef,adamleff/chef,karthikrev/chef,youngjl1/chef,nicklv/chef,nicklv/chef,DeWaRs1206/chef,tas50/chef-1,mikedodge04/chef,ccope/chef,onlyhavecans/chef,aaron-lane/chef,mal/chef,sideci-sample/sideci-sample-chef,renanvicente/chef,joemiller/chef,onlyhavecans/chef,tomdoherty/chef,skmichaelson/chef,MsysTechnologiesllc/chef,clintoncwolfe/chef,someara/chef,EasonYi/chef,nsdavidson/chef,nsdavidson/chef,AndyBoucher/Chef-Testing,sempervictus/chef,swalberg/chef,b002368/chef-repo,OpSitters/chef,circleback/chef,jonlives/chef,BackSlasher/chef,sanditiffin/chef,grubernaut/chef,cgvarela/chef,jkerry/chef,josb/chef,skmichaelson/chef,sempervictus/chef,nalingarg2/chef-1,oclaussen/chef,malisettirammurthy/chef,mikefaille/chef,acaiafa/chef,ckaushik/chef,nathwill/chef,cachamber/chef,legal90/chef,ekometti/chef,criteo-forks/chef,permyakovsv/chef,lamont-granquist/chef,ccsplit/chef,mikedodge04/chef,antonifs/chef,jimmymccrory/chef,jordane/chef,polamjag/chef,ccsplit/chef,malisettirammurthy/chef,webframp/chef,josb/chef,ranjib/chef,antonifs/chef,gsaslis/chef,Tensibai/chef,MichaelPereira/chef,DeWaRs1206/chef,karthikrev/chef,mikefaille/chef,someara/chef,b002368/chef-repo,jagdeesh109/chef,mattray/chef,mwrock/chef,sekrett/chef,sysbot/chef,patcon/chef,jmhardison/chef,permyakovsv/chef,sideci-sample/sideci-sample-chef,sometimesfood/chef,tomdoherty/chef,ktpan/chef-play,sekrett/chef,DeWaRs1206/chef,Igorshp/chef,tas50/chef-1,nalingarg2/chef-1,aaron-lane/chef,docwhat/chef,clintoncwolfe/chef,nellshamrell/chef,lamont-granquist/chef,circleback/chef,mikefaille/chef,juliandunn/chef,askl56/chef,sekrett/chef,askl56/chef,tbunnyman/chef,sekrett/chef,OpSitters/chef,jagdeesh109/chef,nathwill/chef,zshuo/chef,baberthal/chef,evan2645/chef,b002368/chef-repo,custora/chef,erkolson/chef,andrewpsp/chef,ccsplit/chef,ducthanh/chef,jblaine/chef,acaiafa/chef,ccope/chef,skmichaelson/chef,sysbot/chef,oclaussen/chef,sanditiffin/chef,nathwill/chef,juliandunn/chef,nsdavidson/chef,antonifs/chef,b002368/chef-repo,evan2645/chef,sometimesfood/chef,evan2645/chef,docwhat/chef,chef/chef,ktpan/chef-play,MsysTechnologiesllc/chef,nvwls/chef,sometimesfood/chef,higanworks/chef,jblaine/chef,acaiafa/chef,jimmymccrory/chef,Ppjet6/chef,ccsplit/chef,sekrett/chef,martinb3/chef,nicklv/chef,cgvarela/chef,jk47/chef,andrewpsp/chef,smurawski/chef,ekometti/chef,erkolson/chef,jaymzh/chef,tbunnyman/chef,ChaosCloud/chef,jkerry/chef,bahamas10/chef,mio-g/chef,aaron-lane/chef,zuazo-forks/chef,faspl/chef,cgvarela/chef,tbriggs-curse/chef,danielsdeleo/seth,baberthal/chef,faspl/chef,robmul/chef,youngjl1/chef,someara/chef,mal/chef,h4ck3rm1k3/chef,grubernaut/chef,sideci-sample/sideci-sample-chef,docwhat/chef,zuazo-forks/chef,polamjag/chef,ChaosCloud/chef,kaznishi/chef,ducthanh/chef,sometimesfood/chef,criteo-forks/chef,natewalck/chef,jkerry/chef,bahamas10/chef,nalingarg2/chef-1,nathwill/chef,ccope/chef,ranjib/chef,cachamber/chef,Tensibai/chef,brettcave/chef,Igorshp/chef,grubernaut/chef,DeWaRs1206/chef,sometimesfood/chef,patcon/chef,antonifs/chef,askl56/chef,martinisoft/chef,jaymzh/chef,askl56/chef,sideci-sample/sideci-sample-chef,malisettirammurthy/chef,webframp/chef,MichaelPereira/chef,mattray/chef,brettcave/chef,natewalck/chef,onlyhavecans/chef,legal90/chef,BackSlasher/chef,jagdeesh109/chef,jimmymccrory/chef,nvwls/chef,sanditiffin/chef,smurawski/chef,grubernaut/chef,Kast0rTr0y/chef,mikedodge04/chef,jkerry/chef,malisettirammurthy/chef,ranjib/chef,malisettirammurthy/chef,nalingarg2/chef-1,strangelittlemonkey/chef,tas50/chef-1,bahamas10/chef,Kast0rTr0y/chef,mio-g/chef,3dinfluence/chef,polamjag/chef,robmul/chef,Tensibai/chef,jmhardison/chef,nsdavidson/chef,mio-g/chef,nellshamrell/chef,askl56/chef,patcon/chef,ckaushik/chef,jk47/chef,adamleff/chef,paulmooring/chef,ekometti/chef,custora/chef,sysbot/chef,ktpan/chef-play,3dinfluence/chef,someara/chef,ekometti/chef,docwhat/chef,zuazo-forks/chef,EasonYi/chef,danielsdeleo/seth,MichaelPereira/chef,circleback/chef,chef/chef,cachamber/chef,aaron-lane/chef,nguyen-tien-mulodo/chef,danielsdeleo/seth,webframp/chef,zuazo-forks/chef,acaiafa/chef,cgvarela/chef,lamont-granquist/chef,youngjl1/chef,sometimesfood/chef,joemiller/chef,jagdeesh109/chef,bahamas10/chef,karthikrev/chef,Tensibai/chef,legal90/chef,lamont-granquist/chef,adamleff/chef,3dinfluence/chef,erkolson/chef,DeWaRs1206/chef,josb/chef,nicklv/chef,smurawski/chef,tbunnyman/chef,cmluciano/chef,custora/chef,evan2645/chef,nalingarg2/chef-1,sempervictus/chef,h4ck3rm1k3/chef,ckaushik/chef,sempervictus/chef,sempervictus/chef,nathwill/chef,custora/chef,AndyBoucher/Chef-Testing,jonlives/chef,sideci-sample/sideci-sample-chef,skmichaelson/chef,sanditiffin/chef,criteo-forks/chef,paulmooring/chef,youngjl1/chef,martinb3/chef,jmhardison/chef,tbriggs-curse/chef,someara/chef,cmluciano/chef,circleback/chef,tomdoherty/chef,nvwls/chef,webframp/chef,cgvarela/chef,aaron-lane/chef,robmul/chef,smurawski/chef,BackSlasher/chef,zuazo-forks/chef,mattray/chef,nellshamrell/chef,mikefaille/chef,robmul/chef,onlyhavecans/chef,martinisoft/chef,oclaussen/chef,kaznishi/chef,natewalck/chef,patcon/chef,legal90/chef,andrewpsp/chef,permyakovsv/chef,jonlives/chef,Ppjet6/chef,jimmymccrory/chef,permyakovsv/chef,OpSitters/chef,Ppjet6/chef,nguyen-tien-mulodo/chef,EasonYi/chef,juliandunn/chef,mattray/chef,jkerry/chef,oclaussen/chef,mikefaille/chef,ranjib/chef,ducthanh/chef,bahamas10/chef,jimmymccrory/chef,OpSitters/chef,Kast0rTr0y/chef,patcon/chef,tbriggs-curse/chef,jblaine/chef,ccope/chef,mio-g/chef,ekometti/chef,circleback/chef,ducthanh/chef,nvwls/chef,BackSlasher/chef,cachamber/chef,acaiafa/chef,danielsdeleo/seth,custora/chef,youngjl1/chef,jordane/chef,jk47/chef,higanworks/chef,baberthal/chef,swalberg/chef,mikedodge04/chef,3dinfluence/chef,jk47/chef,pburkholder/chef,mio-g/chef,mal/chef,h4ck3rm1k3/chef,strangelittlemonkey/chef,criteo-forks/chef,oclaussen/chef,erkolson/chef,sanditiffin/chef,gsaslis/chef,strangelittlemonkey/chef,onlyhavecans/chef,jonlives/chef,Ppjet6/chef,nsdavidson/chef,MsysTechnologiesllc/chef,clintoncwolfe/chef,lamont-granquist/chef,natewalck/chef,smurawski/chef,joemiller/chef,ccsplit/chef,nsdavidson/chef,natewalck/chef,permyakovsv/chef,b002368/chef-repo,tas50/chef-1,josb/chef,faspl/chef