Merge pull request #4 from CloudifySource/feature/CLOUDIFY-2288-change-deployment-blueprint-api

Feature/cloudify 2288 change deployment blueprint api
Merge branch 'develop' into feature/CLOUDIFY-2296-bootstrap-an-existing-machine