Merge remote-tracking branch 'mainline/develop' into MAGETWO-69004-upgrade_captcha-2.2

Author: cpartica

.travis.yml

@@ -23,6 +23,12 @@ env:
     - TEST_SUITE=integration INTEGRATION_INDEX=3
     - TEST_SUITE=static
     - TEST_SUITE=js
+matrix:
+  exclude:
+    - php: 7.0
+      env: TEST_SUITE=static
+    - php: 7.0
+      env: TEST_SUITE=js
 cache:
   apt: true
   directories:
@@ -33,7 +39,4 @@ cache:
 before_install: ./dev/travis/before_install.sh
 install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh
-script:
-  - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
-  - if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
-  - if [ $TEST_SUITE == "js" ]; then grunt spec; fi
+script: ./dev/travis/script.sh