Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  WORKSPACE: Make heading comment space indent consistent

Change-Id: If6ba973528aed2e7cd07cce67466756732fbba99