Merge change 7625

* changes:
  Whitespace cleanup prior to real work.