[Git][ghc/ghc][master] 2 commits: template-haskell: move some identifiers from ghc-internal to template-haskell