Backport to 5.x of fixes from more recent branches#217

robbavey wants to merge 5 commits intologstash-plugins:5.xlogstash-plugins/logstash-output-kafka:5.xfrom

robbavey:backports_5_xrobbavey/logstash-output-kafka:backports_5_xCopy head branch name to clipboard