(maint) Merge branch '5.3.x' into '6.0.x'
(maint) Merge branch '5.3.x' into '6.0.x'

Conflicts:
  - acceptance/config/beaker/options.rb
  - ruby/puppet

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