Merge branch 'master' into 8724-keep-block-check-script

diff --combined build/run-tests.sh
index 98c8ac55a8f0f5193dfc7e68d2b7e30bd1907b5e,de64b8cc5bac81dbe09094e949504a12b5c394ce..884eda3da13a8f8c25b13bfdad1d19d6ed1bbed9
--- 1/build/run-tests.sh
--- 2/build/run-tests.sh
+++ b/build/run-tests.sh
@@@ -87,7 -87,6 +87,7 @@@ sdk/go/crunchrunne
  sdk/cwl
  tools/crunchstat-summary
  tools/keep-rsync
 +tools/keep-block-check
  
  EOF
  
@@@ -385,7 -384,12 +385,12 @@@ setup_virtualenv() 
      if ! [[ -e "$venvdest/bin/activate" ]] || ! [[ -e "$venvdest/bin/pip" ]]; then
          virtualenv --setuptools "$@" "$venvdest" || fatal "virtualenv $venvdest failed"
      fi
-     "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7'
+     if [[ $("$venvdest/bin/python" --version 2>&1) =~ \ 3\.[012]\. ]]; then
+         # pip 8.0.0 dropped support for python 3.2, e.g., debian wheezy
+         "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7,<8'
+     else
+         "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7'
+     fi
      # ubuntu1404 can't seem to install mock via tests_require, but it can do this.
      "$venvdest/bin/pip" install 'mock>=1.0' 'pbr<1.7.0'
  }
@@@ -710,7 -714,6 +715,7 @@@ gostuff=
      services/crunch-dispatch-slurm
      services/crunch-run
      tools/keep-rsync
 +    tools/keep-block-check
      )
  for g in "${gostuff[@]}"
  do