Shuffle some names around. 'CaretDiagnostic' is inaccurate as this needs

to handle non-caret diagnostics as well in order to be fully useful in
libclang etc. Also sketch out some more of my plans on this refactoring.

llvm-svn: 140476