This adds a compatability option to deal with a Gerrit behavior change between 2.11 and 2.13. Change-Id: I012485065e0fd8692e4f2ef787dd0a62be303314