Update cloudify-config.defaults.yaml
Update cloudify-config.yaml
Merge remote-tracking branch 'gigaspaces/develop' into feature/CFY-747-prefix

Conflicts:
	cloudify_openstack/cloudify-config.yaml