[modules] It's possible to merge into the pattern of a class template before we

load the definition data from the declaration itself. In that case, merge
properly; don't assume the prior definition is the same as our own.

llvm-svn: 226761