Merge "Fix jmx_exporter"