post-rebase fixups

accounts/abi/bind/backends/simulated.go

accounts/abi/bind/backends/simulated_test.go

accounts/abi/reflect.go

cmd/geth/main.go

cmd/state/stateless/deps.go

cmd/state/stateless/naked_accouts.go

cmd/state/stateless/naked_storage.go

cmd/state/stateless/spec_exec.go

cmd/state/stateless/state.go

cmd/state/stateless/tokens.go

cmd/state/stateless/transaction_stats.go

cmd/tester/main.go

cmd/utils/flags.go

consensus/ethash/sealer_test.go

console/bridge.go

console/bridge_test.go

console/console_test.go

core/blockchain.go

core/forkid/forkid.go

core/tx_pool.go