Merge "Use generic user for both zuul v2 and v3"