Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into develop

Author: lanken

dev/tests/static/testsuite/Magento/Test/Legacy/_files/words_ce.xml

@@ -56,5 +56,8 @@
             <path>app/code/Magento/Customer/view/frontend/web/js/zxcvbn.js</path>
             <word>twig</word>
         </item>
+        <item>
+            <path>dev/build/publication/sanity/ce.xml</path>
+        </item>
     </whitelist>
 </config>