CLOUDIFY-2265

fix merge error