As part of JSR199 cleanup, we expect to rename javax.tools.DiagnosticMessage to Diagnostic.
Diagnostic is currently used as the name of an internal class, which should be renamed, to avoid conflicts later.