Deserializing wallet extensions, lock order is now wallet and then extension.

A deadlock condition exists for locks on Wallet and WalletExtension. At save of wallet, wallet lock is acquired and then wallet extensions lock is acquired. At deserialization of a WalletExtension, the extension's lock is acquired and then the wallet lock can be acquired. This happens if the WalletExtension access the wallet, e.g. getTransaction as used in StoredPaymentChannelClientStates. The proposed fix unconditionally acquires the wallet lock before any extension locks.
Aha, I can see the rule now. I will update it. 

A style checker would be nice, but this rule is maybe not possible in the checkstyle tool anyway. The very old Sun Coding Convention requires every if clause to be enclosed in braces.