Merge branch 'stable-2.16'

* stable-2.16:
  Add missing 'Gerrit-HttpModule' to BUILD

Change-Id: I8d0db9ef099aeb16350d6946c64864cdb20093b3