Fix bug 1071174: Use "username" consistently
Merge pull request #2760 from openjck/1071174-username-term-consistency

Fix bug 1071174: Use "username" consistently