Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  WORKSPACE: Make commented out lines spaces indent consistent

Change-Id: I2e9d7a9efdc62f39944bd6d419d87269288847f2