Merge branch 'devel'
merge from devel
master-to-devel-back-merge-fix-cleanup, or so...

Merge branch 'master' into devel

Conflicts:
	examples/phase1_demo_1.py
	examples/phase1_demo_2.py
	examples/phase1_demo_3.py
	troy/plugins/overlay_provisioner/plugin_overlay_provisioner_sagapilot.py
	troy/plugins/workload_dispatcher/plugin_workload_dispatcher_sagapilot.py
	troy/session.py
	troy/strategy.py