[bug 960979] Add cache-machine to UserAvatar.
Merge pull request #595 from johngian/avatar-cache

[bug 960979] Add cache-machine to UserAvatar.
[fix bug 880722] Keep functional area data on form error.
Merge pull request #598 from akatsoulas/880722

[fix bug 880722] Keep functional area data on form error.