JBIDE-14824 - Build/test failures