Prefer .gitconfig username

We should check first the .gitconfig username and then the
environment variables. Otherwise, the .gitconfig username is never
used.

Bug: #1223676
Change-Id: I3b7efd53e1e561108b42a471ddcebfd87984922b
Merge "Prefer .gitconfig username"