Merge branch 'stable-2.9'

* stable-2.9:
  Include gerrit.war in api_{install,deploy}

Change-Id: I5f9222d82ec252a3cc3ee00b7e5a0f1feec64d2b