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