When declaring a template, check that the context doesn't already contain a

declaration of the same name. r155187 caused us to miss this if the prior
declaration did not declare a type.

llvm-svn: 155269