Merge "parametrized gerrit ci upstreams"