Patch available KAFKA-9965/13303

[Jon McEwen]

I have raised a PR for the above tickets.  Please could someone review?

https://github.com/apache/kafka/pull/11326

Thanks,
Jon