ECLIPSE-946 - phase 2 - JVM Monitor merge