Change in gerrit-admin[master]: No need to use OrderedDict