Merge branch 'master' into sigint

Conflicts:
	jenkins/run-tests.sh

diff --cc jenkins/run-tests.sh
index b87a7f5b4e81f01c436e9530c6d912df1490d805,a70606887f4b6c6215c3be123e758aaca8c30284..713ffdab1109a85b6cf4daafb33f64c2cd077931
--- 1/jenkins/run-tests.sh
--- 2/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@@ -582,6 -573,14 +583,13 @@@ test_apiserver() 
  }
  do_test services/api apiserver
  
 -
 -  clean_up
+ # Shortcut for when we're only running apiserver tests. This saves a bit of time,
+ # because we don't need to start up the api server for subsequent tests.
+ if [ ! -z "$only" ] && [ "$only" == "services/api" ]; then
+   rotate_logfile "$WORKSPACE/services/api/log/" "test.log"
++  exit_cleanly
+ fi
+ 
  start_api
  
  test_ruby_sdk() {