ECLIPSE-946 - incorporate phase 2 of JMX merge