Merge from feature-jmx-configgenerator