Merge branch '2.2-develop' of github.com:magento/magento2ce into 2.2-bugs

Author: omiroshnichenko

dev/tests/unit/phpunit.xml.dist

@@ -19,6 +19,7 @@
         <directory suffix="Test.php">../../../vendor/*/module-*/Test/Unit</directory>
         <directory suffix="Test.php">../../../vendor/*/framework/Test/Unit</directory>
         <directory suffix="Test.php">../../../vendor/*/framework/*/Test/Unit</directory>
+        <directory suffix="Test.php">../../tests/unit/*/Test/Unit</directory>
     </testsuite>
     <php>
         <ini name="date.timezone" value="America/Los_Angeles"/>