Merge branch 'MAGETWO-31191' of https://github.corp.ebay.com/magento-vanilla/magento2ce into MAGETWO-31191

Author: Denys Rul

composer.lock

@@ -47,7 +47,9 @@ class WordsFinder
      *
      * @var array
      */
-    protected $copyrightSkipList = [];
+    protected $copyrightSkipList = [
+        'lib/web/legacy-build.min.js'
+    ];
 
     /**
      * Whether copyright presence should be checked or not

dev/tests/static/framework/Magento/TestFramework/Inspection/WordsFinder.php

@@ -52,7 +52,19 @@
             <word>Mage_Adminhtml::profiles</word>
         </item>
         <item>
-            <path>lib/web/legacy-build.min.js</path>
+            <path>dev/tests/static/testsuite/Magento/Test/Php/Exemplar/CodeMessTest/phpmd_ruleset.xsd</path>
+            <word>dataflow</word>
+        </item>
+        <item>
+            <path>lib/internal/Zend</path>
+        </item>
+        <item>
+            <path>dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php</path>
+            <word>overriden</word>
+        </item>
+        <item>
+            <path>dev/tests/api-functional/testsuite/Magento/Webapi/Routing/RequestIdOverrideTest.php</path>
+            <word>overriden</word>
         </item>
     </whitelist>
 </config>