Merge branch 'stable-2.15'

* stable-2.15:
  Cross out gerrit_api_maven_local in WORKSPACE

Change-Id: Ifff4b675547450346f923cff55736b378ca0c268