CFY-988 fixed bug: there was no expanduser() on path for keypair when checking if it exists
dump riemann log when deployment core fails to start
Merge branch 'master' into CFY-1046-threshold-policy

Conflicts:
	plugins/riemann-controller/riemann_controller/tasks.py