Adjust code to work with unpatched bitcoind
Merge branch 'mainline_bitcoind' of github.com:luke-jr/electrum-server into mainline_bitcoind
fixes to complete mainline_bitcoind merge
minor fix
Merge branch '3M3RY-mainline_bitcoind'