Prepare qt_wallet for merge of chain_server branch