UC-2771 - fixed bug that prevented avatar from being updated correctly after remove button was pushed
Merge branch 'release-14.04' into release-14.10