7148758: Resolve merge issue which caused testcase failure

Reviewed-by: alanb, chegar

src/share/classes/sun/net/httpserver/ServerConfig.java

@@ -81,6 +81,10 @@ class ServerConfig {
                     drainAmount = Long.getLong("sun.net.httpserver.drainAmount",
                             DEFAULT_DRAIN_AMOUNT);
 
+                    maxReqHeaders = Integer.getInteger(
+                            "sun.net.httpserver.maxReqHeaders",
+                            DEFAULT_MAX_REQ_HEADERS);
+
                     maxReqTime = Long.getLong("sun.net.httpserver.maxReqTime",
                             DEFAULT_MAX_REQ_TIME);