CFY-1372 cloudify types tosca naming convention
Merge branch 'master' into CFY-1372-tosca-naming-convention

Conflicts:
	cosmo_tester/resources/blueprints/nodecellar_ec2/blueprint_ec2.yaml
CFY-1372 fixed test
Merge pull request #55 from cloudify-cosmo/CFY-1372-tosca-naming-convention

Cfy 1372 tosca naming convention