Merge remote-tracking branch 'origin/master'

# Conflicts:
#	composer.lock

Author: shiftedreality

.magento.app.yaml

@@ -74,14 +74,14 @@ hooks:
     # We run build hooks before your application has been packaged.
     build: |
         set -e
-        php ./vendor/bin/ece-tools build:generate
-        php ./vendor/bin/ece-tools build:transfer
+        php ./vendor/bin/ece-tools run scenario/build/generate.xml
+        php ./vendor/bin/ece-tools run scenario/build/transfer.xml
     # We run deploy hook after your application has been deployed and started.
     deploy: |
-        php ./vendor/bin/ece-tools deploy
+        php ./vendor/bin/ece-tools run scenario/deploy.xml
     # We run post deploy hook to clean and warm the cache. Available with ECE-Tools 2002.0.10.
     post_deploy: |
-        php ./vendor/bin/ece-tools post-deploy
+        php ./vendor/bin/ece-tools run scenario/post-deploy.xml
 
 # Default Magento 2 cron jobs
 crons: