CFY-971 added version to tests blueprints
CFY-1025 fix diamond test
CFY-971 modified dev-requirements for tests
CFY-971 reverted dev-requirements
Merge pull request #135 from cloudify-cosmo/CFY-971-Add-version-field-to-DSL

CFY 971 Add version field to DSL
Merge branch 'master' into CFY-1185-remove-plugin-inheritance

Conflicts:
	tests/resources/dsl/with_plugin.yaml