Rewrite FindDiagnostics to be more strict about the formatting of the

expected-foo strings.  Now the only allowed characters between 
expected-error and {{  is whitespace.

llvm-svn: 59925