Not really an answer but we changed our workflow (no more Gerrit and Jenkins), hence making the whole issue disappear.