message: Make sure to run wallet.py using -usehd=0
  This makes sure we have test coverage for the non-HD wallet in wallet.py
  and the HD wallet in wallet-hd.py regardless of what the default
  HD setting are.
diff: @@ -49,7 +49,8 @@ class WalletTest (BitcoinTestFramework):
  initialize_chain_clean(self.options.tmpdir, 4, bitcoinConfDict, wallets)
  def setup_network(self, split=False):
  - self.nodes = start_nodes(3, self.options.tmpdir)
  + self.node_args = [['-usehd=0'], ['-usehd=0'], ['-usehd=0']]
  + self.nodes = start_nodes(3, self.options.tmpdir, self.node_args)
  connect_nodes_bi(self.nodes,0,1)
  connect_nodes_bi(self.nodes,1,2)
  connect_nodes_bi(self.nodes,0,2)
  @@ -184,7 +185,7 @@ class WalletTest (BitcoinTestFramework):
  txid2 = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1)
  sync_mempools(self.nodes)
  - self.nodes.append(start_node(3, self.options.tmpdir))
  + self.nodes.append(start_node(3, self.options.tmpdir, ['-usehd=0']))
  connect_nodes_bi(self.nodes, 0, 3)
  sync_blocks(self.nodes)
  @@ -230,7 +231,7 @@ class WalletTest (BitcoinTestFramework):
  #do some -walletbroadcast tests
  stop_nodes(self.nodes)
  wait_bitcoinds()
  - self.nodes = start_nodes(3, self.options.tmpdir, [["-walletbroadcast=0"],["-walletbroadcast=0"],["-walletbroadcast=0"]])
  + self.nodes = start_nodes(3, self.options.tmpdir, [["-walletbroadcast=0", "-usehd=0"],["-walletbroadcast=0", "-usehd=0"],["-walletbroadcast=0", "-usehd=0"]])
  connect_nodes_bi(self.nodes,0,1)
  connect_nodes_bi(self.nodes,1,2)
  connect_nodes_bi(self.nodes,0,2)
  @@ -256,7 +257,8 @@ class WalletTest (BitcoinTestFramework):
  #restart the nodes with -walletbroadcast=1
  stop_nodes(self.nodes)
  wait_bitcoinds()
  - self.nodes = start_nodes(3, self.options.tmpdir)
  + self.node_args = [['-usehd=0'], ['-usehd=0'], ['-usehd=0']]
  + self.nodes = start_nodes(3, self.options.tmpdir, self.node_args)
  connect_nodes_bi(self.nodes,0,1)
  connect_nodes_bi(self.nodes,1,2)
  connect_nodes_bi(self.nodes,0,2)
  @@ -432,7 +434,8 @@ class WalletTest (BitcoinTestFramework):
  logging.info("check " + m)
  stop_nodes(self.nodes)
  wait_bitcoinds()
  - self.nodes = start_nodes(3, self.options.tmpdir, [[m]] * 3)
  + self.node_args = [['-usehd=0'], ['-usehd=0'], ['-usehd=0']]
  + self.nodes = start_nodes(3, self.options.tmpdir, self.node_args)
  while m == '-reindex' and [block_count] * 3 != [self.nodes[i].getblockcount() for i in range(3)]:
  # reindex will leave rpc warm up "early"; Wait for it to finish
  time.sleep(0.1)
  