Merge branch 'develop' into feature/CLOUDIFY-2222-manager-rest

Conflicts:
	vagrant/bootstrap_lxc_manager.py
	workflow-service/log4j.properties
CLOUDIFY-2222 redirect services output to file and input from /dev/null
CLOUDIFY-2222 increase services start probing timeout
CLOUDIFY-2222 better error handling
Merge branch 'feature/CLOUDIFY-2222-manager-rest' into feature/CLOUDIFY-2261-deployment-logs

Conflicts:
	manager-rest/manager_rest/resources.py
	workflow-service/log4j.properties
CLOUDIFY-2261 added route for querying deployment events.