Fixing deprecation warnings in gerrit module

Change-Id: Ie19d47eb4e02d86e8eaef7541321fb42eb546ad9
Merge "Fixing deprecation warnings in gerrit module"