...

This is a code cleanup. Existing test suite should catch any failures. Will add or update new unit tests as needed.

Rejected Alternatives

N/ASince BrokerNotFoundException is not used for a very long time, we can remove it directly. But, the protocol we follow is to deprecate them first and then remove them in the next major release. Hence, the two step process.