(cherry picked from commit 143e5d8)

# Conflicts:
#	docs/dev/go-style-guide.md
#	e2e/go.mod
#	e2e/go.sum
#	e2e/semverutil/semver.go
#	e2e/testconfig/testconfig.go
#	go.mod
#	go.sum
#	modules/apps/27-interchain-accounts/controller/keeper/keeper.go
#	modules/apps/transfer/keeper/mbt_relay_test.go
#	modules/apps/transfer/types/trace.go
#	modules/core/02-client/client/utils/utils.go
#	modules/core/02-client/keeper/keeper.go
#	modules/core/03-connection/keeper/keeper.go
#	modules/core/04-channel/types/acknowledgement_test.go
#	modules/core/23-commitment/types/merkle.go
#	modules/core/23-commitment/types/utils.go
#	modules/light-clients/07-tendermint/client_state.go
#	modules/light-clients/07-tendermint/consensus_state.go
#	modules/light-clients/07-tendermint/header.go
#	modules/light-clients/07-tendermint/misbehaviour.go
#	modules/light-clients/07-tendermint/misbehaviour_handle.go
#	modules/light-clients/07-tendermint/update.go
#	testing/README.md
#	testing/chain.go