correct kafka: zookeeper discovery + server configuration file
Merge branch 'master' of github.com:Technicolor-Portico/kafka-cookbook

Conflicts:
	recipes/default.rb
	templates/default/server.properties.erb