Improve reliability of test httpold-4.12.  Thanks AF!
last-moment fix for FreeBSD from Pietro Cerutti
merge 8.4
merge 8.5