Merge branch 'stable-2.15' into stable-2.16

* stable-2.16:
  WORKSPACE: Make commented out lines spaces indent consistent
  WORKSPACE: Make heading comment space indent consistent

Change-Id: I1c4289ad388c56347270cce4c38b40a455e8b6c7