Fix bug where one of the cases where we mangle a <bare-unresolved-name> failed

to emit the <template-args> portion. Refactor so that mangleUnresolvedName
actually emits the entire <unresolved-name>, so this mistake is harder to make
again.

llvm-svn: 285022