JMX changes
Merging with release 0.0.6 branch