Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Set Gerrit to 3.6.4
  Set Gerrit to 3.5.5

Change-Id: Ie382ef1dafea2229416d162a009fbb664958bb3a