JMX Cleanup; also resolved findbugs issue
Merge pull request #1670 from pveentjer/cleanup/jmx

JMX Cleanup; also resolved findbugs issue