cmd/swarm: Merge branch 'master' into multiple-ens-endpoints

accounts/abi/bind/bind.go

accounts/abi/unpack_test.go

bmt/bmt.go

build/ci.go

cmd/faucet/faucet.go

cmd/puppeth/module_dashboard.go

cmd/swarm/config.go

cmd/swarm/config_test.go

consensus/clique/clique.go

console/console_test.go

core/asm/asm.go

core/asm/compiler.go

core/genesis_alloc.go

ethstats/ethstats.go

internal/ethapi/api.go

p2p/discv5/net.go

p2p/discv5/ntp.go

p2p/discv5/ticket.go

p2p/simulations/adapters/state.go

p2p/simulations/http.go