Merge branch 'master' into merge-subs2

cmd/cli/main.go

internal/cli/account.go

internal/cli/account_import.go

internal/cli/account_list.go

internal/cli/account_new.go

internal/cli/chain.go

internal/cli/chain_sethead.go

internal/cli/chain_watch.go

internal/cli/command.go

internal/cli/debug.go

internal/cli/flagset/flagset.go

internal/cli/flagset/flagset_test.go

internal/cli/peers.go

internal/cli/peers_add.go

internal/cli/peers_list.go

internal/cli/peers_remove.go

internal/cli/peers_status.go

internal/cli/server/chains/allocs/mainnet.json

internal/cli/server/chains/allocs/mumbai.json

internal/cli/server/chains/chain.go