CLOUDIFY-2222 fix develop merge bugs