Merge r1718569 from trunk. h2_from_h1: To avoid any further confusion, r->err_headers should be cleared once merged into r->headers_out.