Include updates for SERVER-1975 & SERVER-2198
Include updates for SERVER-1975 & SERVER-2198

These two issues were missed in the Eng ticket grooming. They landed in the 5.3.x branch while we had 5.3.9 release branches up, so they were actually committed before we released 5.3.9 but not shipped with that release.
puppetlabs/puppetserver,puppetlabs/puppetserver,puppetlabs/puppetserver,puppetlabs/puppet-server,puppetlabs/puppetserver,puppetlabs/puppet-server,puppetlabs/puppet-server