[wikimedia] Remove patches integrated in the tree, add PR #3121 and
            PR #3249