Merge pull request #12 from cloudify-cosmo/CFY-972-DSL-alignment-with-tosca

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