Merge branch 'stable-3.1'

* stable-3.1:
  Use bazelisk for builds
  Allow to re-create a previously removed ref

Change-Id: I925d92c366fa3048579bef618507ffa023e3f16b