Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: Icf5e2d176730f15186c8712a1fd61370ec82b6d4