Merge with upstream (geth 1.8.8)

[Szkered]

Tested in ubuntu with public / private transaction and contract deployment.

Currently, the following tests are failing, but it doesn't affect normal workflow.

--- FAIL: TestBindings (9.26s)
                --- FAIL: TestFunkyGasPattern (0.02s)
                --- FAIL: TestGetter (0.01s)
                --- FAIL: TestInteractor (0.01s)
                --- FAIL: TestSlicer (0.01s)
                --- FAIL: TestTupler (0.01s)
                FAIL    _/tmp/017827807/bindtest        0.481s
FAIL    github.com/ethereum/go-ethereum/accounts/abi/bind       11.300s

--- FAIL: TestCash (0.01s)
FAIL    github.com/ethereum/go-ethereum/contracts/chequebook    1.724s

--- FAIL: TestENS (0.02s)
FAIL    github.com/ethereum/go-ethereum/contracts/ens   0.042s

--- FAIL: TestFastVsFullChains (0.00s)
FAIL    github.com/ethereum/go-ethereum/core    2.731s
FAIL    github.com/ethereum/go-ethereum/eth/downloader  0.033s

--- FAIL: TestSequentialAnnouncements62 (0.00s)
FAIL    github.com/ethereum/go-ethereum/eth/fetcher     0.048s

--- FAIL: TestCallTracer (0.00s)
    --- FAIL: TestCallTracer/simple (0.03s)
    --- FAIL: TestCallTracer/innerThrowOuterRevert (0.03s)
    --- FAIL: TestCallTracer/delegatecall (0.03s)
    --- FAIL: TestCallTracer/deepCalls (0.02s)
FAIL    github.com/ethereum/go-ethereum/eth/tracers     0.198s

--- FAIL: TestServerSetupConn (0.03s)
FAIL    github.com/ethereum/go-ethereum/p2p     0.200s

--- FAIL: TestSimulation (0.00s)
FAIL 1    github.com/ethereum/go-ethereum/whisper/whisperv5       14.889s

Need some help in debugging these.

[jpmsam]

#496