Diagnosis of JENKINS-16474 complicated by the fact that documentation did not match revised default values.
Merge branch 'master' into ajp13-disabled