Further updates to message broker xml config