Dont add kafka metadata by default
Closes #1691
Merge remote-tracking branch 'upstream/master'