Fix merge error in remote_directory_spec
Fix merge error in remote_directory_spec

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