chore: catch up main to v21.1.x (backport #7215)

[mergify]

This is an automatic backport of pull request #7215 done by Mergify.
Cherry-pick of c5a5147 has failed:

On branch mergify/bp/v21.x/pr-7215
Your branch is up to date with 'origin/v21.x'.

You are currently cherry-picking commit c5a51475.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.md
	modified:   osmomath/go.mod
	modified:   osmoutils/cache_ctx.go
	modified:   osmoutils/go.mod
	modified:   tests/cl-genesis-positions/go.mod
	modified:   tests/cl-go-client/go.mod
	modified:   x/epochs/go.mod
	modified:   x/epochs/types/hooks.go
	modified:   x/epochs/types/hooks_test.go
	modified:   x/ibc-hooks/go.mod
	modified:   x/incentives/keeper/distribute.go
	modified:   x/incentives/keeper/iterator.go
	modified:   x/incentives/keeper/iterator_test.go
	modified:   x/superfluid/keeper/epoch.go
	modified:   x/txfees/keeper/feedecorator.go
	modified:   x/txfees/keeper/feedecorator_test.go
	modified:   x/txfees/keeper/txfee_filters/arb_tx.go
	modified:   x/txfees/keeper/txfee_filters/arb_tx_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   osmomath/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

[github-actions]

Important Notice

This PR modifies an in-repo Go module. It is one of:

• osmomath
• osmoutils
• x/ibc-hooks
• x/epochs

The dependent Go modules, especially the root one, will have to be
updated to reflect the changes. Failing to do so might cause e2e to fail.

Please follow the instructions below:

1. Open https://github.com/osmosis-labs/osmosis/actions/workflows/go-mod-auto-bump.yml
2. Provide the current branch name
3. On success, confirm if an automated commit corretly updated the go.mod and go.sum files

Please let us know if you need any help.