Committed as revision 136891, with a few small changes to the new note text in DiagnosticSemaKinds.td for consistency.