[Git][ghc/ghc][master] 2 commits: Major patch to re-engineer known-key names