Updating distribution management
Set Zookeeper path back to production Zookeeper.
Merge remote-tracking branch 'upstream/master' into gx_events

Conflicts:
	pom.xml