Merge branch 'stable-3.6' into stable-3.7

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

Change-Id: I211ca8452b5bb1005b71c43b897ad51d4c51563b