Merge "Set Gerrit to 3.5.4" into stable-3.5