ENTMQ-581 - more changes to handle properly stopping the broker that couldn't start properly