More 3rdparty/jvm consolidation.