merge

Fix JMX MBeans ObjectNames for tomcat configurations