Develop 4 r10backendfixes

These are the fixes for stringReplace of extended attributes in email. This also includes a bug fix for a property definition in the account entity. This only exists in the develop_4 branch.

Please merge in.