Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  run_test.sh: Fix bazelisk location detection
  PolyGerrit: Run WCT tests using bazelisk

Change-Id: Ia5d3c3da14ac3c9e416550d704d56364bba52983

polygerrit-ui/app/run_test.sh

@@ -12,9 +12,15 @@ if [[ -z "$wct_bin" ]]; then
     exit 1
 fi
 
+bazel_bin=$(which bazelisk 2>/dev/null)
+if [[ -z "$bazel_bin" ]]; then
+    echo "Warning: bazelisk is not installed; falling back to bazel."
+    bazel_bin=bazel
+fi
+
 # WCT tests are not hermetic, and need extra environment variables.
 # TODO(hanwen): does $DISPLAY even work on OSX?
-bazel test \
+${bazel_bin} test \
       --test_env="HOME=$HOME" \
       --test_env="WCT=${wct_bin}" \
       --test_env="WCT_ARGS=${WCT_ARGS}" \