make it compile against latest stable-2.6 gerrit branch