Merge remote-tracking branch 'upstream/5.5.x' into 6.0.x

* upstream/5.5.x:
  (packaging) Updating manpage file for 5.5.x
  Revert "Merge pull request puppetlabs#7401 from joshcooper/certmismatch_8213"

 Conflicts:
	lib/puppet/network/http/connection.rb
	man/man8/puppet-ca.8
	man/man8/puppet-cert.8
	man/man8/puppet-certificate.8
	man/man8/puppet-certificate_request.8
	man/man8/puppet-certificate_revocation_list.8
	man/man8/puppet-master.8
	spec/unit/network/http/connection_spec.rb

Author: joshcooper