Correctly handle > 257 substitutions in a single mangling, and don't introduce

a spurious substitution for an unscoped dependent template-id after introducing
a substitution for the scoped template-id.

llvm-svn: 105699