update for 2.8.5 and small errors for non-user for gerrit