KAFKA-16905: Fixed potential thread block by admin API#16217

mumrah merged 2 commits intoapache:trunkapache/kafka:trunkfrom

apoorvmittal10:threadapoorvmittal10/kafka:threadCopy head branch name to clipboard