MERGE: develop => stable.

Author: Rene Damm

.yamato/format.yml

@@ -2,7 +2,7 @@ check_formatting:
   name : Check formatting
   agent:
     type: Unity::VM::osx
-    image: buildfarm/mac:stable
+    image: desktop/desktop-macos-10.14:latest
     flavor: m1.mac
   commands:
     - hg clone -b stable http://hg-mirror-slo.hq.unity3d.com/unity-extra/unity-meta

.yamato/upm-ci.yml

@@ -36,7 +36,7 @@ build_ios_{{ editor.version }}:
     flavor: b1.large
   commands:
     - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - unity-downloader-cli -c Editor -c iOS -u {{ editor.version }} --fast
+    - unity-downloader-cli -c Editor -c iOS -u {{ editor.version }} --fast -w
     - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output utr
     - chmod +x ./utr
     - ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --build-only
@@ -78,7 +78,7 @@ build_android_{{ editor.version }}_{{ backend.name }}:
       flavor: b1.xlarge
   commands:
     - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - unity-downloader-cli -c Editor -c Android -u {{ editor.version }} --fast  
+    - unity-downloader-cli -c Editor -c Android -u {{ editor.version }} --fast -w
     - curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr.bat --output utr.bat
     - ./utr.bat --suite=playmode --platform=Android --editor-location=.Editor --testproject=. --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend.name }} --build-only
   artifacts: