Merge "Simplify gerrit-parameters into one macro"