Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I3c56ad4f8a5d58cdb39f77c5d742f60a4cf6352a