CFY-1185 fix plugin yaml
Merge branch 'master' into CFY-1185-remove-plugin-inheritance
Merge pull request #6 from cloudify-cosmo/CFY-1185-remove-plugin-inheritance

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