Tweak duplicate category diagnostic to work like the duplicate protocol diagnostic.

Also, point out where the previous decl was.  This unxfails two tests.

llvm-svn: 59918