(maint) Remove trailing whitespace
(maint) Remove trailing whitespace

This causes automatic mergeups to fail, since it thinks that conflict markers
were not cleaned up appropriately.

puppetlabs/puppetserver,puppetlabs/puppet-server,puppetlabs/puppetserver,puppetlabs/puppet-server,puppetlabs/puppet-server,puppetlabs/puppetserver,puppetlabs/puppetserver