Synchronize on DiagnosticGroup.forType. Fixes issue 1124
R=johnlenz
Tweak the grammar for this/new types. Fixes issue 1105
R=johnlenz
Merge remote-tracking branch: upstream/master