Updates to wallet import handling of encrypted wallets.