CFY-721 updated cloudify-config and cloudify-config.defaults