Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Set VERSION to 2.10.4
  Release notes for Gerrit 2.10.4
  Update version to 2.10.4

Change-Id: Ia61940b9a6fcc6619782f7cb537f819caab2bcf7