JBIDE-13973 - Test failures in Kepler >= M6