Merge "Fix JMX plugin mismatch with yangtools"