Fix a bug in my previous commit. The problem is not that we were not using the

canonical decl for the template, but that we were not merging attributes for
templates at all!

llvm-svn: 160157