(cherry picked from commit 64a6c2c1b6) Conflicts: cmd/geth/js.go internal/web3ext/web3ext.go
64a6c2c1b6