[Git][ghc/ghc][wip/spj-reinstallable-base2] 2 commits: Major patch to re-engineer known-key names