Merge remote-tracking branch 'origin/MAGETWO-44111' into BugFestW4

Author: kandy

app/code/Magento/CatalogSearch/etc/adminhtml/system.xml

@@ -27,11 +27,6 @@
                     <label>Maximum Query Length</label>
                     <validate>validate-digits</validate>
                 </field>
-                <field id="use_layered_navigation_count" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Apply Layered Navigation if Search Results are Less Than</label>
-                    <validate>validate-digits</validate>
-                    <comment>Enter "0" to enable layered navigation for any number of results.</comment>
-                </field>
             </group>
         </section>
     </system>

app/code/Magento/CatalogSearch/etc/config.xml

@@ -15,7 +15,6 @@
                 <engine>mysql</engine>
                 <min_query_length>1</min_query_length>
                 <max_query_length>128</max_query_length>
-                <use_layered_navigation_count>0</use_layered_navigation_count>
             </search>
         </catalog>
     </default>

app/code/Magento/Search/etc/adminhtml/system.xml

@@ -18,11 +18,6 @@
                         <field id="engine">mysql</field>
                     </depends>
                 </field>
-                <field id="use_layered_navigation_count">
-                    <depends>
-                        <field id="engine">mysql</field>
-                    </depends>
-                </field>
             </group>
         </section>
     </system>