Merge branch 'nd/test-lib-httpd-show-error-log-in-verbose'