[Git][ghc/ghc][wip/10.0.1-backports] 5 commits: ghc-internal: annotateSTM should use catchSTM# rather than catch#