Code to update an existing user row never actually worked—just added a new one.
[JENKINS-18641] Test passing in 1.520.
Merge commit '50c2bb3'
Now to check behavior in trunk.