MODE-2343 Added more robust handling when shutting down the repository change bus.

Sounds good.