user autocomplete should return either username or email, depending on user_key
Adjust User.autocomplete test in object controller tests
Merge pull request #356 from avalonmediasystem/bugfix/VOV-2853

Bugfix/vov 2853