Wallet: give up on using read/write locks for the keychain, the re-entrancy rules are too hard to follow. Switch back to a regular lock.
Fix a wrong lock, spotted by Andreas