Bug 526040: Merge Java 9 related changes from JDT
- fix merge errors & remaining compile errors
5 files changed