back out caching changes in CWalletTx::GetAmounts
Merge branch 'master-1.6' into moon