KAFKA-6054: Code cleanup to prepare the actual fix for an upgrade path#4630

mjsax merged 3 commits into

apache:trunkapache/kafka:trunkfrom

mjsax:kafka-6054-fix-upgrademjsax/kafka:kafka-6054-fix-upgradeCopy head branch name to clipboard