White space related lint fixes
Mostly white-space related lint fixes.

No tabs please!
Remove trainling white-space.
Merge pull request #9532 from s0undt3ch/develop

Mostly white-space lint fixes