Merge branch 'master' into 14965-arv-mount-py-three

refs #14965

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --cc build/run-tests.sh
Simple merge

diff --cc sdk/python/tests/run_test_server.py
Simple merge

diff --cc services/fuse/setup.py
index 0bc4a0b653120bdb4763454447c60369430a8600,0439d7d0ca1c8c314b8308d394e0ed528e3744b8..ae1aa019bbb43f55aee277afea61cc309ca8cbd7
--- 1/services/fuse/setup.py
--- 2/services/fuse/setup.py
+++ b/services/fuse/setup.py
@@@ -38,9 -43,9 +43,9 @@@ setup(name='arvados_fuse'
            ('share/doc/arvados_fuse', ['agpl-3.0.txt', 'README.rst']),
        ],
        install_requires=[
-         'arvados-python-client >= 0.1.20151118035730',
-         'llfuse >=1.2, <=1.3.6',
+         'arvados-python-client{}'.format(pysdk_dep),
 -        # llfuse 1.3.4 fails to install via pip
 -        'llfuse >=1.2, <1.3.4',
++        'llfuse >= 1.3.6',
 +        'future',
          'python-daemon',
          'ciso8601 >= 2.0.0',
          'setuptools',

diff --cc tools/arvbox/lib/arvbox/docker/Dockerfile.base
Simple merge