Fix cloudify-cloudstack-plugin/plugin.yaml.template path
Add - type: plugin.yaml
Remove path: cloudify-cloudstack-plugin/plugin.yaml.template - it is included in type: plugin.yaml
Merge branch 'master' into adjust-to-new-repex-variables-features