Fix merge conflict
Fix merge conflict

scalp42/bento_veewee,josephholsten/bento,josephholsten/bento,leohmoraes/bento,devopxteam/bento,osuosl/bento,mtnsat/bento,erikj/bento,v1k0d3n/bento,117111302/bento,mkristiansen/bento,grdryn/bento,zuazo-forks/bento,leejones/bento,osuosl/bento,ammonkc/vm-packer,bgandon/bento,sporting-news/bento,117111302/bento,patcon/bento,patrickmcclory/bento,jhoblitt/bento,risdenk/bento,juliandunn/bento,juliandunn/bento,legal90/bento,dthtvwls/bento,RallySoftware-cookbooks/bento,orpiske/bento,patcon/bento,dmlb2000/bento,geoHeil/packerPuphetPuppet,norcams/bento,stumped2/packer,dmlb2000/bento,sporting-news/bento,pingworks/bento,devopxteam/bento,devopxteam/bento,eyecat/bento_vmir,juliandunn/bento,William-Yeh/bento,RallySoftware-cookbooks/bento,loadsys/packer-builds,davidalger/bento,mkristiansen/bento,ConSol/bento,v1k0d3n/bento,b1-systems/bento,runsystem-hiennt2/bento,brianm/baseboxes,Sauraus/bento,techmaniack/bento,chef/bento,rickard-von-essen/bento,someara/bento,scalp42/bento_veewee,Oefenweb/bento,rickard-von-essen/bento,lwieske/bento,pingworks/bento,norcams/bento,loadsys/packer-builds,tas50/bento,zuazo-forks/bento,mtnsat/bento,geoHeil/packerPuphetPuppet,0x90/bento,runsystem-hiennt2/bento,vincentaubert/bento,davidalger/bento,streamlinesocial/bento,loadsys/packer-builds,techmaniack/bento,bgandon/bento,mmckinst/bento,ConSol/bento,risdenk/bento,orpiske/bento,tas50/bento,masteinhauser/bento-solaris,mmckinst/bento,William-Yeh/bento,vincentaubert/bento,ammonkc/vm-packer,lwieske/bento,thinktainer/bento,chef/bento,dthtvwls/bento,masteinhauser/bento-solaris,0x90/bento,legal90/bento,brianm/baseboxes,sillvan/bento,chef/bento,patrickmcclory/bento,Oefenweb/bento,lwieske/bento,b1-systems/bento,legal90/bento,streamlinesocial/bento,techmaniack/bento,eyecat/bento_vmir,vincentaubert/bento,grdryn/bento,devopxteam/bento,stumped2/packer,leohmoraes/bento,erikj/bento,thinktainer/bento,ConSol/bento,tas50/bento,leejones/bento,norcams/bento,sillvan/bento,jhoblitt/bento,someara/bento,Sauraus/bento