merge before-ghci -> before-ghci-branch-merged into the ghc
(non-compiler) parts of the tree.