replaced zookeeper
pass zk as argument to start-kafka-shell
Merge remote-tracking branch 'upstream/master' into docker1.3

Conflicts:
	fig.yml