Merge "Revert gerrit-patch macro back to git review"