Merge branch 'master' into 14988-wb-rails5-upgrade

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --cc build/run-tests.sh
index 5ca3b8e42599dea5a0a5db952becfe6e51743849,d9dd1bbdd3d093e411a479712495ecd0d9849018..68fc15183e5a55cb488cab48c7f9a83367f6c075
--- 1/build/run-tests.sh
--- 2/build/run-tests.sh
+++ b/build/run-tests.sh
@@@ -1046,7 -1051,7 +1051,11 @@@ test_gofmt() 
  test_services/api() {
      rm -f "$WORKSPACE/services/api/git-commit.version"
      cd "$WORKSPACE/services/api" \
++<<<<<<< HEAD
 +        && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec bin/rails test TESTOPTS='-v -d' ${testargs[services/api]}
++=======
+         && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test TESTOPTS='-v -d' ${testargs[services/api]}
++>>>>>>> master
  }
  
  test_sdk/ruby() {