[modules] Support merging a parsed default argument with an imported hidden...

[modules] Support merging a parsed default argument with an imported hidden one for non-type and template template parameters too.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@237815 91177308-0d34-0410-b5e6-96231b3b80d8