STORM-498: make ZK connection timeout configurable in Kafka spout
Merge branch 'STORM-498' of github.com:miguno/storm into STORM-498

Conflicts:
	CHANGELOG.md