Merge "Generalize Gerrit non-voting Review Macro Name"