Merge r377738 and r377780 from trunk, fixing child-threads using 100% cpu in mod_proxy.

PR: 38403


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@390724 13f79535-47bb-0310-9956-ffa450edef68