Fix wrong SFS entry "Identities.Amount":
- This is the most recent style of specifying the amount. The "Amount" without prefix is legacy.
- addIdentityFields() sets this to 1 already, so it is important that we set it to the correct value.
Merge branch 'master' into issue-6085-database-cleanup