Fix httpd config option 'script_timeout'

This fixes the usage of the httpd configuration option 'script_timeout',
which got ignored before.

The documentation states that the value is in seconds, which was true
when using the Apache like configuration file, but not true when using
the proplist style configuration.
Merge branch 'maint-r15' into maint-r16