Bug 526040: Merge Java 9 related changes from JDT
- fix ResolveTests9 
  - fix omission in JDT, see Bug 527070
  - avoid NPE
2 files changed