MAGETWO-34787: Process pull request

Author: Dale Sikkema

app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php

@@ -9,7 +9,6 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-
 class IgnoreTaxNotification extends \Magento\Tax\Controller\Adminhtml\Tax
 {
     /**

app/code/Magento/Ui/etc/di.xml

@@ -252,9 +252,4 @@
             <argument name="subject" xsi:type="object">uiComponentAggregatedSourceOverrideThemeFiltered</argument>
         </arguments>
     </virtualType>
-    <type name="Magento\Ui\DataProvider\Manager">
-        <arguments>
-            <argument name="config" xsi:type="object">Magento\Ui\DataProvider\Config\Data\Proxy</argument>
-        </arguments>
-    </type>
 </config>

lib/internal/Magento/Framework/Data/Collection/Filesystem.php

@@ -284,6 +284,7 @@ protected function _collectRecursive($dir)
      * @param bool $printQuery
      * @param bool $logQuery
      * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @throws \Exception
      */
     public function loadData($printQuery = false, $logQuery = false)

lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/logger_classes.php

@@ -4,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 
+//@codingStandardsIgnoreStart
 namespace Magento\Test\Di {
+
     /**
      * Test classes used for \Magento\Framework\ObjectManager\Test\Unit\Profiler\FactoryDecoratorTest
      */
@@ -13,9 +15,12 @@ class WrappedClass
 
     }
 }
+
 namespace Magento\Test\Di\WrappedClass {
+
     class Logger
     {
 
     }
 }
+//@codingStandardsIgnoreEnd