CLOUDIFY-2544 fix merge bug