Migrating to Eclipse JDT 4.22 from 4.21