CFY-1185 fix blueprints
Merge branch 'master' into CFY-1185-remove-plugin-inheritance

Conflicts:
	cosmo_tester/resources/blueprints/windows/blueprint.yaml
Merge pull request #45 from cloudify-cosmo/CFY-1185-remove-plugin-inheritance

CFY-1185 fix blueprints
Merge branch 'master' into CFY-971-Add-version-field-to-DSL