[ANN] Round 2 (and 3) of Gerrit upgrade