Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Remove `@NoHttpd` from IT tests that interact with Gerrit Rest API

Change-Id: Ia25c8da867a3e68251e2f1b7cef6fd7efad3a4d3