CLOUDIFY-2425 removed policies and changed topology to nodes
Merge pull request #25 from CloudifySource/feature/CLOUDIFY-2425-riemann-multi-deployments

CLOUDIFY-2425 removed policies and changed topology to nodes
Merge branch 'develop' into feature/CLOUDIFY-2475-dynamic-management-plugins-and-worker-per-deployment

Conflicts:
	dsl_parser/parser.py
CLOUDIFY-2475 fix tests and flake