Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

test/stdlib/KVOKeyPaths.swift

@@ -214,7 +214,7 @@ let optionalKeyPathObserver = testObjectForOptionalKeyPath.observe(\.optionalObj
 testObjectForOptionalKeyPath.optionalObject = nil
 testObjectForOptionalKeyPath.optionalObject = "foo"
 
-// CHECK-LABEL: observe keyPath with optional value
-// CHECK-NEXT: oldValue = Optional(nil), newValue = Optional(nil)
-// CHECK-NEXT: oldValue = Optional(nil), newValue = Optional(nil)
-// CHECK-NEXT: oldValue = Optional(nil), newValue = Optional(Optional("foo"))
+// CHECK-51-LABEL: observe keyPath with optional value
+// CHECK-51-NEXT: oldValue = Optional(nil), newValue = Optional(nil)
+// CHECK-51-NEXT: oldValue = Optional(nil), newValue = Optional(nil)
+// CHECK-51-NEXT: oldValue = Optional(nil), newValue = Optional(Optional("foo"))