In the log I see things like:

    2017-09-13 03:54:33 init message: Rescanning...
    2017-09-13 03:54:33 Rescanning last 68616 blocks (from block 416339)...
    2017-09-13 03:54:40 AddToWallet xxxxx  update
    2017-09-13 03:55:33 Still rescanning. At block 418849. Progress=0.549138

I would be interested to see the wallet file name on each of these log lines.

Would there be any interest in merging such a PR?
assert(!encrypted_batch);
        encrypted_batch = new WalletBatch(*database);
        if (!encrypted_batch->TxnBegin()) {
            delete encrypted_batch;
            encrypted_batch = nullptr;
            return false;
        }
        encrypted_batch->WriteMasterKey(nMasterKeyMaxID, kMasterKey);
        if (!EncryptKeys(_vMasterKey))
        {
            encrypted_batch->TxnAbort();
            delete encrypted_batch;
            
            
            assert(false);
        }
        
        SetMinVersion(FEATURE_WALLETCRYPT, encrypted_batch, true);
        if (!encrypted_batch->TxnCommit()) {
            delete encrypted_batch;
            
            
            assert(false);
        }
        delete encrypted_batch;
        encrypted_batch = nullptr;
        Lock();
        Unlock(strWalletPassphrase);
        
        if (IsHDEnabled()) {