Merge branch 'stable-3.7' into stable-3.8

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

Change-Id: I627839e9ee837f1a0b16aa297f9b90782972c885