Merge branch 'master' of https://github.com/rcbops-qa/monster into logging

Conflicts:
	monster/provisioners/openstack.py