JBIDE-15209: Use classes form rev571 (9.2.1.5 release)