[Git][ghc/ghc][wip/T26579] 36 commits: Preserve user-written kinds in data declarations