Merge branch 'master' into 10576-cwl-keep-fetcher

Conflicts:
	sdk/cwl/setup.py

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

diff --cc sdk/cwl/setup.py
index 069c06d4d5cea5d856e97dd8791924b98f0da2e8,7a8ec3a0dd3c51743720076f67c230d6af4706c8..3750a7e14dff488c5735337af30f9cac5d30e73f
--- 1/sdk/cwl/setup.py
--- 2/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@@ -45,12 -45,12 +45,13 @@@ setup(name='arvados-cwl-runner'
            'bin/cwl-runner',
            'bin/arvados-cwl-runner'
        ],
 -      # Make sure to update arvados/build/run-build-packages.sh as well
 -      # when updating the cwltool version pin.
 +      # Note that arvados/build/run-build-packages.sh looks at this
 +      # file to determine what version of cwltool and schema-salad to build.
        install_requires=[
 -          'cwltool==1.0.20161128202906',
 +          'cwltool==1.0.20161207161158',
 +          'schema-salad==1.21.20161206204028',
-           'arvados-python-client>=0.1.20160826210445'
+           'arvados-python-client>=0.1.20160826210445',
+           'setuptools'
        ],
        data_files=[
            ('share/doc/arvados-cwl-runner', ['LICENSE-2.0.txt', 'README.rst']),