MINOR: Account for different versions in upgrade#6835

bbejeck merged 3 commits into

apache:trunkapache/kafka:trunkfrom

bbejeck:MINOR_account_for_different_versions_in_upgradebbejeck/kafka:MINOR_account_for_different_versions_in_upgradeCopy head branch name to clipboard