WIP hackday stuff
Merge remote-tracking branch 'ironcladlou/hackday/asyncgears' into hackday/asyncgears

Conflicts:
	node/lib/openshift-origin-node/agent/node_agent.rb
	plugins/msg-broker/mcollective/lib/openshift/mcollective_application_container_proxy.rb