Merge branch 'stable-3.1'

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

Change-Id: I1cefa1433c77e9e4ce3de8d35b9204c241ec933a