Whitespace cleanup for hotfix-1.5

Nothing exciting but I came across a minor white space issue in the hotfx-1.5 branch during other work. This pull request addresses all white space issues present in the branch.

Adding @whimboo and @davehunt for visibility.