Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  WORKSPACE: Make header line space indent consistent
  WORKSPACE: Fix oddly looking spaces indent for commented out line

Change-Id: I59ee5a3c74bc4c317b76852858f2f4cb05616519