(maint) Merge up af11668 to master
(maint) Merge up af11668 to master

Generated by CI

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