(maint) Merge up 5ef4735 to 6.4.x

Generated by CI

* commit '5ef473584bef4d95488dbdf2b07b25c606dd7e1f':
  (maint) simplify reading /opt/puppetlabs/server/pe_version

Author: puppetlabs-jenkins

lib/puppet/indirector/catalog/compiler.rb

@@ -395,9 +395,7 @@ def set_server_facts
     # Add our server Puppet Enterprise version, if available.
     pe_version_file = '/opt/puppetlabs/server/pe_version'
     if File.readable?(pe_version_file) and !File.zero?(pe_version_file)
-      pe_version_data = File.read(pe_version_file).chomp
-      pe_serverversion = pe_version_data.match(/(\d+\.\d+\.\d+)/)
-      @server_facts['pe_serverversion'] = pe_serverversion[1] if pe_serverversion
+      @server_facts['pe_serverversion'] = File.read(pe_version_file).chomp
     end
 
     # Add our server version to the fact list