Merge branch 'stable-3.1'

* stable-3.1:
  Add active worker threads check
  Allow using healthcheck on slaves
  Reformat with GJF 1.7

Feature: Issue 12240
Change-Id: If3d5de5d7a7a76a1fb09b1a155e36cc130881be9