8195153: [test] runtime/6981737/Test6981737.java shouldn't check 'java.vendor' and 'java.vm.vendor' properties Reviewed-by: dholmes

8194953: doclet corrupts HTML files when adding navbar Reviewed-by: jjg

8189146: Have use of "var" in 9 and earlier source versions issue a warning for type declarations Reviewed-by: mcimadamore, jjg

8181047: Add comment to technical terms that shall not be translated Reviewed-by: lancea, ljiang

8195598: Reference to overloaded method is ambiguous with 3 methods but works with 2 Summary: Pertinent to applicability bit set on argument expression even if only one method is not pertinent Reviewed-by: vromero

8195667: ProblemList PKCS11 tests Secmod/AddTrustedCert.java and tls/TestKeyMaterial.java due to JDK-8180837 Summary: Puts sun/security/pkcs11/Secmod/AddTrustedCert.java and sun/security/pkcs11/tls/TestKeyMaterial.java into ProblemList Reviewed-by: weijun

8194864: Outputs more details for PKCS11 tests if the NSS lib version cannot be determined Summary: It outputs the lib content if the lib version cannot be parsed Reviewed-by: xuelei

8190229: Non-ASCII characters in java.security file after 8186093 Reviewed-by: weijun

8194879: Runtime.Version parses string which does not conform to spec without throwing IAE Reviewed-by: alanb, iris, rriggs

8194554: filterArguments runs multiple filters in the wrong order Reviewed-by: psandoz, jrose

8189102: All tools should support -?, -h and --help Reviewed-by: kvn, jjg, weijun, alanb, rfield, ksrini

8194960: Add a test for trust manager and cacerts keystore sanity Reviewed-by: weijun

8193300: Miscellaneous changes imported from jsr166 CVS 2018-01 Reviewed-by: martin

8191483: AbstractQueuedSynchronizer cancel/cancel race Reviewed-by: martin

8195119: Fine-tune output text in keytool Reviewed-by: mullan

Merge