Merge branch 'master' into develop

Conflicts:
	.openshift/action_hooks/post_start_python
	.openshift/action_hooks/post_stop_python
	.openshift/action_hooks/pre_start_python
	.openshift/action_hooks/pre_stop_python
	openshift.conf.py