PR10147: When substituting a template template argument, substitute in the most

recent (non-friend) declaration to pick up the right set of default template
arguments.

llvm-svn: 312049