Move upgrade catalog code for Kafka listeners to version 2.5

The upgrade catalog code for kafka listeners should be moved from 2.4 to 2.5 once the upgrade catalog code is added for the next version.

This is a follow up on the JIRA-17694, including the reviewers comment here

UpgradeCatalog240 is not the best option for trunk. It should be UpgradeCatalog for the next release number. Otherwise, upgrade from 240 to next release will miss these changes.

You can open a JIRA to resolve it once next UpgradeCatalog is identified. For now, ok to leave the code here.