fixed mbean tree for both AMQ 5.7 and 5.8 so it mostly seems to work ok