MAGETWO-54228: Varnish cache disabled on most html requests

- Added catalogsearch exclusion to varnish3.vcl
- Cleaned up comments on varnish4.vcl

Author: bwaters

app/code/Magento/PageCache/etc/varnish3.vcl

@@ -49,8 +49,8 @@ sub vcl_recv {
         return (pass);
     }
 
-    # Bypass shopping cart and checkout requests
-    if (req.url ~ "/checkout") {
+    # Bypass shopping cart, checkout and search requests
+    if (req.url ~ "/checkout" || req.url ~ "/catalogsearch") {
         return (pass);
     }
 

app/code/Magento/PageCache/etc/varnish4.vcl

@@ -137,13 +137,11 @@ sub vcl_backend_response {
         }
     }
 
-   #If page is not cacheable then bypass varnish for 2 minutes as Hit-For-Pass
+   # If page is not cacheable then bypass varnish for 2 minutes as Hit-For-Pass
    if (beresp.ttl <= 0s ||
         beresp.http.Surrogate-control ~ "no-store" ||
         (!beresp.http.Surrogate-Control && beresp.http.Vary == "*")) {
-        /*
-         * Mark as "Hit-For-Pass" for the next 2 minutes
-         */
+        # Mark as Hit-For-Pass for the next 2 minutes
         set beresp.ttl = 120s;
         set beresp.uncacheable = true;
     }