Fix some trailing whitespace issues found by puppet-lint