Merge branch 'stable-2.16'

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

Change-Id: Id475d81689df1dc3e2c8615ec8548b04d4d9285e