Merge branch 'master' into master+ZODB4-wc2

* master:
  software/theia: Enable resiliency test with Python3
  Version up slapos.toolbox 0.124
  software/theia: version up 1.17.2
  software/theia: Disable integrated git credentials prompt
  software/theia: version up 1.17.0

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance-theia]
 _update_hash_filename_ = instance-theia.cfg.jinja.in
-md5sum = 562acf69f344fa9f6d03992d696462d0
+md5sum = e39925b69a8bc17d17be54c075ae2f88
 
 [instance]
 _update_hash_filename_ = instance.cfg.in
@@ -47,7 +47,7 @@ md5sum = 9e8c17a4b2d802695caf0c2c052f0d11
 
 [yarn.lock]
 _update_hash_filename_ = yarn.lock
-md5sum = 18e8302b2acff3721cad23d829e3df55
+md5sum = c65949e402ba7c47c0354e3c7438b094
 
 [python-language-server-requirements.txt]
 _update_hash_filename_ = python-language-server-requirements.txt

software/theia/instance-theia.cfg.jinja.in

@@ -594,7 +594,8 @@ template =
       "**/node_modules/**": true,
       "$${directory:runner}/**":true,
       "$${directory:project}/runner/**":true
-    }
+    },
+    "git.terminalAuthentication": false
   }
 
 [runner-link]

software/theia/test/test_resiliency.py

@@ -30,10 +30,8 @@ import errno
 import os
 import re
 import shutil
-import six
 import subprocess
 import time
-import unittest
 
 import requests
 
@@ -472,7 +470,6 @@ class TakeoverMixin(ExportAndImportMixin):
     return resp.text
 
 
-@unittest.skipIf(six.PY3, "resilient stack is not python3-compatible")
 class TestTheiaResilience(ResilienceMixin, TakeoverMixin, ResilientTheiaTestCase):
   test_instance_max_retries = 0
   backup_max_tries = 70

stack/slapos.cfg

@@ -199,7 +199,7 @@ slapos.rebootstrap = 4.5
 slapos.recipe.build = 0.47
 slapos.recipe.cmmi = 0.17
 slapos.recipe.template = 4.6
-slapos.toolbox = 0.123
+slapos.toolbox = 0.124
 stevedore = 1.21.0:whl
 subprocess32 = 3.5.4
 unicodecsv = 0.14.1