CLOUDIFY-2340 fix bad merge