Merge "Migrate gerrit-maven-stage (DCAEGEN)-4"