merge from trunk:

   core: Fix up botched status lines (mismatch with r->status or
         just badly formatted)

reviewed by: jerenkrantz, jorton



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