Merge branch 'upstream-master'

Author: Datadog Syncup Service

test/jdk/jdk/jfr/tool/TestView.java

@@ -91,13 +91,13 @@ private static void testTableView(String recording) throws Throwable {
 
     private static void testEventType(String recording) throws Throwable {
         OutputAnalyzer output = ExecuteHelper.jfr(
-             "view", "--verbose", "--width", "300", "--cell-height", "100", "SystemGC", recording);
+             "view", "--verbose", "--width", "300", "--cell-height", "100", "ThreadSleep", recording);
         // Verify title
-        output.shouldContain("System GC");
+        output.shouldContain("Thread Sleep");
         // Verify headings
-        output.shouldContain("Invoked Concurrent");
+        output.shouldContain("Sleep Time");
         // Verify verbose headings
-        output.shouldContain("invokedConcurrent");
+        output.shouldContain("time");
         // Verify thread value
         output.shouldContain(Thread.currentThread().getName());
         // Verify stack frame

test/jdk/sun/security/tools/keytool/PKCS12Passwd.java

@@ -108,7 +108,7 @@ public static void main(String[] args) throws Exception {
 
         check("p12", "newpass", "newpass");
 
-        // Conversely, a JKS keystore can be laoded as a PKCS12, and it follows
+        // Conversely, a JKS keystore can be loaded as a PKCS12, and it follows
         // PKCS12 rules that both passwords are changed at the same time and
         // some commands are rejected.