merge master to 1.10, with fixes (#7682)

_includes/tocsearch.html

@@ -6,7 +6,12 @@
     {% if item.section %}
       {% include tocsearch.html tree=item.section toc=include.toc %}
     {% else %}
-      {% if item == page.path %}
+      {% if item.path %}
+        {% assign filename = item.path | replace: '/', ' ' | strip | replace: ' ', '/' | append: '.md' %}
+      {% else %}
+        {% assign filename = item %}
+      {% endif %}
+      {% if filename == page.path %}
         {% assign found_toc = include.toc %}
         {% break %}
       {% endif %}