CLOUDIFY-2370 fix merge bug