ENTMQ-581 - more changes to handle properly stopping the broker that cou...

...ldn't start properly