CLOUDIFY-2528 fixed wrong merge