Merge "Add DCAE Cloudify-Manager support"