CLOUDIFY-2147 Fix branch merge errors