merge the differences in apache-1.3 from tag mpm-merge-1 up to

APACHE_1_3_9 (a.k.a. mpm-merge-2) onto the mpm tree

prior to the merge, the mpm tree was tagged with apache-1_3-merge-2-pre,
and after the merge, the mpm tree will be tagged with
apache-1_3-merge-2-post


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83709 13f79535-47bb-0310-9956-ffa450edef68