JMXCollector changes to simplify configuration