CFY-972
Merge branch 'master' into CFY-972-DSL-alignment-with-tosca
CFY-972 fixed rest service tests
Merge pull request #106 from cloudify-cosmo/CFY-972-DSL-alignment-with-tosca

Cfy 972 dsl alignment with tosca
Merge branch 'master' into CFY-1049-policies