Merge branch 'stable-3.5' into stable-3.6

* stable-3.5:
  Add missing Singleton to ActiveWokersCheck and DeadlockCheck
  Add active http workers check

Change-Id: I1ea62b3b8b91841e4239acb1a31f130f97abddc5