fix merge garbage
initial commit from https://github.com/crowbar/barclamp-deployer