Merge branch 'stable-2.16'

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

Change-Id: Ie4dc701c229830152e600fb23979fe580c8c3efd