CLOUDIFY-2426 add start detection policy to base type
CLOUDIFY-2426 changes to be able to start a manager with changes not yet in develop
CLOUDIFY-2426 changes to be able to start a manager with changes not yet in develop
CLOUDIFY-2426 changes to be able to start a manager with changes not yet in develop
CLOUDIFY-2426 changes to be able to start a manager with changes not yet in develop
CLOUDIFY-2426 remove 'tagged' from riemann default rules
CLOUDIFY-2426 remove temp code
Merge pull request #136 from CloudifySource/feature/CLOUDIFY-2426-simplify-policies

Simplify policies
Merge branch 'develop' into feature/CLOUDIFY-2386-logs-events-integration

Conflicts:
	vagrant/bootstrap_lxc_manager.py