Merge branch 'stable-3.4' * stable-3.4: Use new kafka broker name Point to correct ZK URL Change-Id: I840cce5b1012912f3624a1dc3a97810d7484bb9b