8169093: Generics, javac not matching actual and formal arguments. Summary: Make diagnostic for type-args arity mismatch consistent with the class case Reviewed-by: vromero

8168854: javac erroneously reject a a service interface inner class in a provides clause Summary: Java SE 9 proposed spec changes do not explicitly forbid a service interface to be an inner class - javac should follow Reviewed-by: jjg

8161983: JShell API: Clean-up following 8160127 et. al. Reviewed-by: jlahoda

8129559: JShell: compilation fails if class, method or field is annotated and has modifiers 8080354: JShell: Runtime visible annotations cannot be retrieved Reviewed-by: jlahoda

Merge

8167975: align javac --add-* modules options with launcher Reviewed-by: jlahoda

8161969: jshell tool: /var value is not truncated per feedback setting 8166637: jshell tool: confusing truncation of long result values 8154513: JShell tool: welcome message should match feedback mode 8167552: jshell tool: Typo in jshell command '/? /reload' description Reviewed-by: jlahoda

8166857: langtools build.xml broken on windows Reviewed-by: jjg, jlahoda, mcimadamore

8166635: getEnclosedElements() on package causes BadClassFile error Summary: Properly reading typevars from enclosing scopes for local classes. Reviewed-by: mcimadamore

8167636: jshell tool: Edit Pad should be in its own module Reviewed-by: jlahoda