Removed all whitespace changes on branch vs master (no functional changes)

This commit serves to make the diff between this branc and master easier
to read, review and merge.