BZ-10447: fix model collisions on $scope.avatarUrl