Merge branch 'stable-2.9' * stable-2.9: Build against Gerrit 2.9 Change-Id: I5c9eb5ddd30dc19f1a246b420a988854b2774268 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>