post-rebase fixes

accounts/abi/pack.go

cmd/devp2p/internal/ethtest/chain.go

cmd/devp2p/internal/ethtest/suite.go

cmd/devp2p/internal/ethtest/types.go

cmd/devp2p/rlpxcmd.go

cmd/utils/flags.go

eth/downloader/downloader.go

eth/downloader/downloader_stagedsync_test.go

eth/downloader/downloader_test.go

eth/gasprice/gasprice.go

eth/helper_test.go

go.mod

go.sum

miner/miner.go

miner/miner_test.go

p2p/rlpx/rlpx.go

p2p/rlpx/rlpx_test.go

p2p/server_test.go

p2p/transport.go

p2p/transport_test.go