Merge changes from topic "gerrit-maven-stage"