puppet 6.13.0-universal-darwin → 6.18.0-universal-darwin

data/lib/puppet/util/windows/sid.rb

@@ -64,7 +64,7 @@ module Puppet::Util::Windows
     # 'BUILTIN\Administrators', or 'S-1-5-32-544', and will return the
     # SID object. Returns nil if the account doesn't exist.
     # This method returns a SID::Principal with the account, domain, SID, etc
-    def name_to_principal(name)
+    def name_to_principal(name, allow_unresolved = false)
       # Apparently, we accept a symbol..
       name = name.to_s.strip if name
 
@@ -79,7 +79,7 @@ module Puppet::Util::Windows
 
       raw_sid_bytes ? Principal.lookup_account_sid(raw_sid_bytes) : Principal.lookup_account_name(name)
     rescue
-      nil
+      (allow_unresolved && raw_sid_bytes) ? unresolved_principal(name, raw_sid_bytes) : nil
     end
     module_function :name_to_principal
     class << self; alias name_to_sid_object name_to_principal; end
@@ -236,7 +236,7 @@ module Puppet::Util::Windows
     # @api private
     def self.unresolved_principal(name, sid_bytes)
       Principal.new(
-        name + " (unresolvable)", # account
+        name, # account
         sid_bytes, # sid_bytes
         name, # sid string
         nil, #domain

data/lib/puppet/util/windows/user.rb

@@ -16,6 +16,22 @@ module Puppet::Util::Windows::User
   end
   module_function :admin?
 
+  # The name of the account in all locales is `LocalSystem`. `.\LocalSystem` or `ComputerName\LocalSystem' can also be used.
+  # This account is not recognized by the security subsystem, so you cannot specify its name in a call to the `LookupAccountName` function.
+  # https://docs.microsoft.com/en-us/windows/win32/services/localsystem-account
+  def localsystem?(name)
+    ["LocalSystem", ".\\LocalSystem", "#{Puppet::Util::Windows::ADSI.computer_name}\\LocalSystem"].any?{ |s| s.casecmp(name) == 0 }
+  end
+  module_function :localsystem?
+
+  # Check if a given user is one of the default system accounts
+  # These accounts do not have a password and all checks done through logon attempt will fail
+  # https://docs.microsoft.com/en-us/windows/security/identity-protection/access-control/local-accounts#default-local-system-accounts
+  def default_system_account?(name)
+    user_sid = Puppet::Util::Windows::SID.name_to_sid(name)
+    [Puppet::Util::Windows::SID::LocalSystem, Puppet::Util::Windows::SID::NtLocal, Puppet::Util::Windows::SID::NtNetwork].include?(user_sid)
+  end
+  module_function :default_system_account?
 
   # https://msdn.microsoft.com/en-us/library/windows/desktop/ee207397(v=vs.85).aspx
   SECURITY_MAX_SID_SIZE = 68
@@ -57,9 +73,9 @@ module Puppet::Util::Windows::User
   end
   module_function :check_token_membership
 
-  def password_is?(name, password)
+  def password_is?(name, password, domain = '.')
     begin
-      logon_user(name, password) { |token| }
+      logon_user(name, password, domain) { |token| }
     rescue Puppet::Util::Windows::Error => detail
 
       authenticated_error_codes = Set[
@@ -74,7 +90,7 @@ module Puppet::Util::Windows::User
   end
   module_function :password_is?
 
-  def logon_user(name, password, &block)
+  def logon_user(name, password, domain = '.', &block)
     fLOGON32_PROVIDER_DEFAULT = 0
     fLOGON32_LOGON_INTERACTIVE = 2
     fLOGON32_LOGON_NETWORK = 3
@@ -83,8 +99,8 @@ module Puppet::Util::Windows::User
     begin
       FFI::MemoryPointer.new(:handle, 1) do |token_pointer|
         #try logon using network else try logon using interactive mode
-        if logon_user_by_logon_type(name, password, fLOGON32_LOGON_NETWORK, fLOGON32_PROVIDER_DEFAULT, token_pointer) == FFI::WIN32_FALSE
-          if logon_user_by_logon_type(name, password, fLOGON32_LOGON_INTERACTIVE, fLOGON32_PROVIDER_DEFAULT, token_pointer) == FFI::WIN32_FALSE
+        if logon_user_by_logon_type(name, domain, password, fLOGON32_LOGON_NETWORK, fLOGON32_PROVIDER_DEFAULT, token_pointer) == FFI::WIN32_FALSE
+          if logon_user_by_logon_type(name, domain, password, fLOGON32_LOGON_INTERACTIVE, fLOGON32_PROVIDER_DEFAULT, token_pointer) == FFI::WIN32_FALSE
             raise Puppet::Util::Windows::Error.new(_("Failed to logon user %{name}") % {name: name.inspect})
           end
         end
@@ -98,11 +114,10 @@ module Puppet::Util::Windows::User
     # token has been closed by this point
     true
   end
-
   module_function :logon_user
 
-  def self.logon_user_by_logon_type(name, password, logon_type, logon_provider, token)
-    LogonUserW(wide_string(name), wide_string('.'), password.nil? ? FFI::Pointer::NULL : wide_string(password), logon_type, logon_provider, token)
+  def self.logon_user_by_logon_type(name, domain, password, logon_type, logon_provider, token)
+    LogonUserW(wide_string(name), wide_string(domain), password.nil? ? FFI::Pointer::NULL : wide_string(password), logon_type, logon_provider, token)
   end
 
   private_class_method :logon_user_by_logon_type
@@ -130,6 +145,125 @@ module Puppet::Util::Windows::User
   end
   module_function :load_profile
 
+  def get_rights(name)
+    user_info = Puppet::Util::Windows::SID.name_to_principal(name.sub(/^\.\\/, "#{Puppet::Util::Windows::ADSI.computer_name}\\"))
+    return "" unless user_info
+
+    rights = []
+    rights_pointer = FFI::MemoryPointer.new(:pointer)
+    number_of_rights = FFI::MemoryPointer.new(:ulong)
+    sid_pointer = FFI::MemoryPointer.new(:byte, user_info.sid_bytes.length).write_array_of_uchar(user_info.sid_bytes)
+
+    new_lsa_policy_handle do |policy_handle|
+      result = LsaEnumerateAccountRights(policy_handle.read_pointer, sid_pointer, rights_pointer, number_of_rights)
+      check_lsa_nt_status_and_raise_failures(result, "LsaEnumerateAccountRights")
+    end
+
+    number_of_rights.read_ulong.times do |index|
+      right = LSA_UNICODE_STRING.new(rights_pointer.read_pointer + index * LSA_UNICODE_STRING.size)
+      rights << right[:Buffer].read_arbitrary_wide_string_up_to
+    end
+
+    result = LsaFreeMemory(rights_pointer.read_pointer)
+    check_lsa_nt_status_and_raise_failures(result, "LsaFreeMemory")
+
+    rights.join(",")
+  end
+  module_function :get_rights
+
+  def set_rights(name, rights)
+    rights_pointer = new_lsa_unicode_strings_pointer(rights)
+    user_info = Puppet::Util::Windows::SID.name_to_principal(name.sub(/^\.\\/, "#{Puppet::Util::Windows::ADSI.computer_name}\\"))
+    sid_pointer = FFI::MemoryPointer.new(:byte, user_info.sid_bytes.length).write_array_of_uchar(user_info.sid_bytes)
+
+    new_lsa_policy_handle do |policy_handle|
+      result = LsaAddAccountRights(policy_handle.read_pointer, sid_pointer, rights_pointer, rights.size)
+      check_lsa_nt_status_and_raise_failures(result, "LsaAddAccountRights")
+    end
+  end
+  module_function :set_rights
+
+  def remove_rights(name, rights)
+    rights_pointer = new_lsa_unicode_strings_pointer(rights)
+    user_info = Puppet::Util::Windows::SID.name_to_principal(name.sub(/^\.\\/, "#{Puppet::Util::Windows::ADSI.computer_name}\\"))
+    sid_pointer = FFI::MemoryPointer.new(:byte, user_info.sid_bytes.length).write_array_of_uchar(user_info.sid_bytes)
+
+    new_lsa_policy_handle do |policy_handle|
+      result = LsaRemoveAccountRights(policy_handle.read_pointer, sid_pointer, false, rights_pointer, rights.size)
+      check_lsa_nt_status_and_raise_failures(result, "LsaRemoveAccountRights")
+    end
+  end
+  module_function :remove_rights
+
+  # ACCESS_MASK flags for Policy Objects
+  # https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-lsad/b61b7268-987a-420b-84f9-6c75f8dc8558
+  POLICY_VIEW_LOCAL_INFORMATION   = 0x00000001
+  POLICY_VIEW_AUDIT_INFORMATION   = 0x00000002
+  POLICY_GET_PRIVATE_INFORMATION  = 0x00000004
+  POLICY_TRUST_ADMIN              = 0x00000008
+  POLICY_CREATE_ACCOUNT           = 0x00000010
+  POLICY_CREATE_SECRET            = 0x00000020
+  POLICY_CREATE_PRIVILEGE         = 0x00000040
+  POLICY_SET_DEFAULT_QUOTA_LIMITS = 0x00000080
+  POLICY_SET_AUDIT_REQUIREMENTS   = 0x00000100
+  POLICY_AUDIT_LOG_ADMIN          = 0x00000200
+  POLICY_SERVER_ADMIN             = 0x00000400
+  POLICY_LOOKUP_NAMES             = 0x00000800
+  POLICY_NOTIFICATION             = 0x00001000
+
+  def self.new_lsa_policy_handle
+    access = 0
+    access |= POLICY_LOOKUP_NAMES
+    access |= POLICY_CREATE_ACCOUNT
+    policy_handle = FFI::MemoryPointer.new(:pointer)
+
+    result = LsaOpenPolicy(nil, LSA_OBJECT_ATTRIBUTES.new, access, policy_handle)
+    check_lsa_nt_status_and_raise_failures(result, "LsaOpenPolicy")
+
+    begin
+      yield policy_handle
+    ensure
+      result = LsaClose(policy_handle.read_pointer)
+      check_lsa_nt_status_and_raise_failures(result, "LsaClose")
+    end
+  end
+  private_class_method :new_lsa_policy_handle
+
+  def self.new_lsa_unicode_strings_pointer(strings)
+    lsa_unicode_strings_pointer = FFI::MemoryPointer.new(LSA_UNICODE_STRING, strings.size)
+
+    strings.each_with_index do |string, index|
+      lsa_string = LSA_UNICODE_STRING.new(lsa_unicode_strings_pointer + index * LSA_UNICODE_STRING.size)
+      lsa_string[:Buffer] = FFI::MemoryPointer.from_string(wide_string(string))
+      lsa_string[:Length] = string.length * 2
+      lsa_string[:MaximumLength] = lsa_string[:Length] + 2
+    end
+
+    lsa_unicode_strings_pointer
+  end
+  private_class_method :new_lsa_unicode_strings_pointer
+
+  # https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/18d8fbe8-a967-4f1c-ae50-99ca8e491d2d
+  def self.check_lsa_nt_status_and_raise_failures(status, method_name)
+    error_code = LsaNtStatusToWinError(status)
+
+    error_reason = case error_code.to_s(16)
+    when '0' # ERROR_SUCCESS
+      return # Method call succeded
+    when '2' # ERROR_FILE_NOT_FOUND
+      return # No rights/privilleges assigned to given user
+    when '5' # ERROR_ACCESS_DENIED
+      "Access is denied. Please make sure that puppet is running as administrator."
+    when '521' # ERROR_NO_SUCH_PRIVILEGE
+      "One or more of the given rights/privilleges are incorrect."
+    when '6ba' # RPC_S_SERVER_UNAVAILABLE
+      "The RPC server is unavailable or given domain name is invalid."
+    end
+
+    raise Puppet::Error.new("Calling `#{method_name}` returned 'Win32 Error Code 0x%08X'. #{error_reason}" % error_code)
+  end
+  private_class_method :check_lsa_nt_status_and_raise_failures
+
   ffi_convention :stdcall
 
   # https://msdn.microsoft.com/en-us/library/windows/desktop/aa378184(v=vs.85).aspx
@@ -314,4 +448,104 @@ module Puppet::Util::Windows::User
   ffi_lib :advapi32
   attach_function_private :IsValidSid,
     [:pointer], :win32_bool
+
+  # https://docs.microsoft.com/en-us/windows/win32/api/lsalookup/ns-lsalookup-lsa_object_attributes
+  # typedef struct _LSA_OBJECT_ATTRIBUTES {
+  #   ULONG               Length;
+  #   HANDLE              RootDirectory;
+  #   PLSA_UNICODE_STRING ObjectName;
+  #   ULONG               Attributes;
+  #   PVOID               SecurityDescriptor;
+  #   PVOID               SecurityQualityOfService;
+  # } LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;
+  class LSA_OBJECT_ATTRIBUTES < FFI::Struct
+    layout :Length, :ulong,
+      :RootDirectory, :handle,
+      :ObjectName, :plsa_unicode_string,
+      :Attributes, :ulong,
+      :SecurityDescriptor, :pvoid,
+      :SecurityQualityOfService, :pvoid
+  end
+
+  # https://docs.microsoft.com/en-us/windows/win32/api/lsalookup/ns-lsalookup-lsa_unicode_string
+  # typedef struct _LSA_UNICODE_STRING {
+  #   USHORT Length;
+  #   USHORT MaximumLength;
+  #   PWSTR  Buffer;
+  # } LSA_UNICODE_STRING, *PLSA_UNICODE_STRING;
+  class LSA_UNICODE_STRING < FFI::Struct
+    layout :Length, :ushort,
+      :MaximumLength, :ushort,
+      :Buffer, :pwstr
+  end
+
+  # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsaenumerateaccountrights
+  # https://docs.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/user-rights-assignment
+  # NTSTATUS LsaEnumerateAccountRights(
+  #   LSA_HANDLE          PolicyHandle,
+  #   PSID                AccountSid,
+  #   PLSA_UNICODE_STRING *UserRights,
+  #   PULONG              CountOfRights
+  # );
+  ffi_lib :advapi32
+  attach_function_private :LsaEnumerateAccountRights,
+    [:lsa_handle, :psid, :plsa_unicode_string, :pulong], :ntstatus
+
+  # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsaaddaccountrights
+  # NTSTATUS LsaAddAccountRights(
+  #   LSA_HANDLE          PolicyHandle,
+  #   PSID                AccountSid,
+  #   PLSA_UNICODE_STRING UserRights,
+  #   ULONG               CountOfRights
+  # );
+  ffi_lib :advapi32
+  attach_function_private :LsaAddAccountRights,
+    [:lsa_handle, :psid, :plsa_unicode_string, :ulong], :ntstatus
+
+  # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsaremoveaccountrights
+  # NTSTATUS LsaRemoveAccountRights(
+  #   LSA_HANDLE          PolicyHandle,
+  #   PSID                AccountSid,
+  #   BOOLEAN             AllRights,
+  #   PLSA_UNICODE_STRING UserRights,
+  #   ULONG               CountOfRights
+  # );
+  ffi_lib :advapi32
+  attach_function_private :LsaRemoveAccountRights,
+    [:lsa_handle, :psid, :bool, :plsa_unicode_string, :ulong], :ntstatus
+
+  # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsaopenpolicy
+  # NTSTATUS LsaOpenPolicy(
+  #   PLSA_UNICODE_STRING    SystemName,
+  #   PLSA_OBJECT_ATTRIBUTES ObjectAttributes,
+  #   ACCESS_MASK            DesiredAccess,
+  #   PLSA_HANDLE            PolicyHandle
+  # );
+  ffi_lib :advapi32
+  attach_function_private :LsaOpenPolicy,
+    [:plsa_unicode_string, :plsa_object_attributes, :access_mask, :plsa_handle], :ntstatus
+
+  # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsaclose
+  # NTSTATUS LsaClose(
+  #   LSA_HANDLE ObjectHandle
+  # );
+  ffi_lib :advapi32
+  attach_function_private :LsaClose,
+    [:lsa_handle], :ntstatus
+
+  # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsafreememory
+  # NTSTATUS LsaFreeMemory(
+  #   PVOID Buffer
+  # );
+  ffi_lib :advapi32
+  attach_function_private :LsaFreeMemory,
+    [:pvoid], :ntstatus
+
+  # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsantstatustowinerror
+  # ULONG LsaNtStatusToWinError(
+  #   NTSTATUS Status
+  # );
+  ffi_lib :advapi32
+  attach_function_private :LsaNtStatusToWinError,
+    [:ntstatus], :ulong
 end

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '6.13.0'
+  PUPPETVERSION = '6.18.0'
 
   ##
   # version is a public API method intended to always provide a fast and

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 6.12.0-140-gec3639ae66\n"
+"Project-Id-Version: Puppet automation framework 6.17.0-93-gddd91ef701\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2020-02-07 12:49+0000\n"
-"PO-Revision-Date: 2020-02-07 12:49+0000\n"
+"POT-Creation-Date: 2020-07-30 16:49+0000\n"
+"PO-Revision-Date: 2020-07-30 16:49+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -44,25 +44,25 @@ msgstr ""
 msgid "Please supply a parameter to perform a Hiera lookup"
 msgstr ""
 
-#: ../lib/hiera_puppet.rb:75 ../lib/puppet/indirector/hiera.rb:81
+#: ../lib/hiera_puppet.rb:75 ../lib/puppet/indirector/hiera.rb:85
 msgid "Config file %{hiera_config} not found, using Hiera defaults"
 msgstr ""
 
-#: ../lib/puppet.rb:130
+#: ../lib/puppet.rb:144
 msgid "Support for ruby version %{version} is deprecated and will be removed in a future release. See https://puppet.com/docs/puppet/latest/system_requirements.html for a list of supported ruby versions."
 msgstr ""
 
-#: ../lib/puppet.rb:188
+#: ../lib/puppet.rb:230
 msgid "The environmentpath setting cannot be empty or nil."
 msgstr ""
 
 #. TRANSLATORS: `message` is an already translated string of why SSL failed to initialize
-#: ../lib/puppet.rb:218
+#: ../lib/puppet.rb:257
 msgid "Failed to initialize SSL: %{message}"
 msgstr ""
 
 #. TRANSLATORS: `puppet agent -t` is a command and should not be translated
-#: ../lib/puppet.rb:220
+#: ../lib/puppet.rb:259
 msgid "Run `puppet agent -t`"
 msgstr ""
 
@@ -72,27 +72,39 @@ msgid ""
 "Use 'puppet agent --enable' to re-enable."
 msgstr ""
 
-#: ../lib/puppet/agent.rb:63
+#: ../lib/puppet/agent.rb:68
 msgid "Run of %{client_class} already in progress; skipping  (%{lockfile_path} exists)"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:66
+#: ../lib/puppet/agent.rb:71
+msgid "Exiting now because the maxwaitforlock timeout has been exceeded."
+msgstr ""
+
+#: ../lib/puppet/agent.rb:74
+msgid "Another puppet instance is already running; --waitforlock flag used, waiting for running instance to finish."
+msgstr ""
+
+#: ../lib/puppet/agent.rb:75 ../lib/puppet/ssl/state_machine.rb:279 ../lib/puppet/ssl/state_machine.rb:310
+msgid "Will try again in %{time} seconds."
+msgstr ""
+
+#: ../lib/puppet/agent.rb:80
 msgid "Execution of %{client_class} did not complete within %{runtimeout} seconds and was terminated."
 msgstr ""
 
-#: ../lib/puppet/agent.rb:71
+#: ../lib/puppet/agent.rb:85
 msgid "Could not run %{client_class}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:78
+#: ../lib/puppet/agent.rb:92
 msgid "Shutdown/restart in progress (%{status}); skipping run"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:96
+#: ../lib/puppet/agent.rb:110
 msgid "puppet agent: applying configuration"
 msgstr ""
 
-#: ../lib/puppet/agent.rb:127
+#: ../lib/puppet/agent.rb:133
 msgid "Could not create instance of %{client_class}: %{detail}"
 msgstr ""
 
@@ -178,23 +190,23 @@ msgstr ""
 msgid "Cancelling startup"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:82
+#: ../lib/puppet/application/agent.rb:83
 msgid "The puppet agent daemon"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:399
+#: ../lib/puppet/application/agent.rb:409
 msgid "Fingerprint asked but neither the certificate, nor the certificate request have been issued"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:404
+#: ../lib/puppet/application/agent.rb:414
 msgid "Failed to generate fingerprint: %{message}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:427
+#: ../lib/puppet/application/agent.rb:437
 msgid "Starting Puppet client version %{version}"
 msgstr ""
 
-#: ../lib/puppet/application/agent.rb:443
+#: ../lib/puppet/application/agent.rb:453
 msgid "The puppet agent command does not take parameters"
 msgstr ""
 
@@ -204,7 +216,7 @@ msgstr ""
 
 #. TRANSLATORS "puppet apply" is a program command and should not be translated
 #. TRANSLATORS "puppet apply" is a program command and should not be translated
-#: ../lib/puppet/application/apply.rb:207 ../lib/puppet/application/apply.rb:322
+#: ../lib/puppet/application/apply.rb:207 ../lib/puppet/application/apply.rb:320
 msgid "For puppet apply"
 msgstr ""
 
@@ -212,27 +224,27 @@ msgstr ""
 msgid "%{file} is not readable"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:293 ../lib/puppet/application/script.rb:239
+#: ../lib/puppet/application/apply.rb:286 ../lib/puppet/application/script.rb:239
 msgid "Exiting"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:332
+#: ../lib/puppet/application/apply.rb:330
 msgid "Could not deserialize catalog from %{format}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:353 ../lib/puppet/application/script.rb:144
+#: ../lib/puppet/application/apply.rb:351 ../lib/puppet/application/script.rb:144
 msgid "Could not find facts for %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:365 ../lib/puppet/application/script.rb:152
+#: ../lib/puppet/application/apply.rb:363 ../lib/puppet/application/script.rb:152
 msgid "Could not find node %{node}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:378 ../lib/puppet/application/script.rb:137
+#: ../lib/puppet/application/apply.rb:376 ../lib/puppet/application/script.rb:137
 msgid "Could not find file %{manifest}"
 msgstr ""
 
-#: ../lib/puppet/application/apply.rb:379
+#: ../lib/puppet/application/apply.rb:377
 msgid "Only one file can be applied per run.  Skipping %{files}"
 msgstr ""
 
@@ -240,7 +252,7 @@ msgstr ""
 msgid "Manage certificates and requests (Disabled)"
 msgstr ""
 
-#: ../lib/puppet/application/describe.rb:175
+#: ../lib/puppet/application/describe.rb:177
 msgid "Display help about resource types"
 msgstr ""
 
@@ -354,41 +366,30 @@ msgstr ""
 msgid "Store and retrieve files in a filebucket"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:208
+#: ../lib/puppet/application/filebucket.rb:221
 msgid "You must specify a file to back up"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:212
+#: ../lib/puppet/application/filebucket.rb:225
 msgid "%{file}: no such file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:216
+#: ../lib/puppet/application/filebucket.rb:229
 msgid "%{file}: cannot read file"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:238 ../lib/puppet/application/filebucket.rb:261
+#: ../lib/puppet/application/filebucket.rb:251 ../lib/puppet/application/filebucket.rb:274
 msgid "Need exactly two arguments: filebucket diff <file_a> <file_b>"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:258
+#: ../lib/puppet/application/filebucket.rb:271
 msgid "Comparing %{checksum_a} %{checksum_b} %{file_a} %{file_b}"
 msgstr ""
 
-#: ../lib/puppet/application/filebucket.rb:272
+#: ../lib/puppet/application/filebucket.rb:285
 msgid "Cancelling"
 msgstr ""
 
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/application/filebucket.rb:293
-msgid "Selected server from first entry of the `server_list` setting: %{server}:%{port}"
-msgstr ""
-
-#. TRANSLATORS 'server' is the name of a setting and should not be translated
-#. TRANSLATORS 'server' is the name of a setting and should not be translated
-#: ../lib/puppet/application/filebucket.rb:300 ../lib/puppet/indirector/request.rb:218
-msgid "Selected server from the `server` setting: %{server}"
-msgstr ""
-
 #: ../lib/puppet/application/lookup.rb:8
 msgid "Run 'puppet lookup --help' for more details"
 msgstr ""
@@ -523,90 +524,85 @@ msgstr ""
 msgid "Removed %{label} %{path}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:22
+#: ../lib/puppet/configurer.rb:21
 msgid "Puppet configuration client"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:45
+#: ../lib/puppet/configurer.rb:44
 msgid "Removing corrupt state file %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:50
+#: ../lib/puppet/configurer.rb:49
 msgid "Cannot remove %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:73
+#: ../lib/puppet/configurer.rb:72
 msgid "Using cached catalog from environment '%{environment}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:79
+#: ../lib/puppet/configurer.rb:78
 msgid "Not using cache on failed catalog"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:88
+#: ../lib/puppet/configurer.rb:87
 msgid "Not using cached catalog because its environment '%{catalog_env}' does not match '%{local_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:93 ../lib/puppet/configurer.rb:176
+#: ../lib/puppet/configurer.rb:92 ../lib/puppet/configurer.rb:174
 msgid "Using cached catalog from environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:169
+#: ../lib/puppet/configurer.rb:167
 msgid "Could not retrieve catalog; skipping run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:185
+#: ../lib/puppet/configurer.rb:183
 msgid "Applied catalog in %{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:225 ../lib/puppet/http/resolver/server_list.rb:19
+#: ../lib/puppet/configurer.rb:219 ../lib/puppet/http/resolver/server_list.rb:68
 msgid "Could not select a functional puppet master from server_list: '%{server_list}'"
 msgstr ""
 
-#. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:228
-msgid "Selected puppet server from the `server_list` setting: %{server}:%{port}"
-msgstr ""
-
-#: ../lib/puppet/configurer.rb:260
+#: ../lib/puppet/configurer.rb:256
 msgid "Local environment: '%{local_env}' doesn't match the environment of the cached catalog '%{catalog_env}', switching agent to '%{catalog_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:305
+#: ../lib/puppet/configurer.rb:301
 msgid "Local environment: '%{local_env}' doesn't match server specified node environment '%{node_env}', switching agent to '%{node_env}'."
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:310
+#: ../lib/puppet/configurer.rb:316
 msgid "Using configured environment '%{env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:314
+#: ../lib/puppet/configurer.rb:320
 msgid "Unable to fetch my node definition, but the agent run will continue:"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:343
+#: ../lib/puppet/configurer.rb:348
 msgid "Not using catalog because its environment '%{catalog_env}' does not match agent specified environment '%{local_env}' and strict_environment_mode is set"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:354
+#: ../lib/puppet/configurer.rb:359
 msgid "Catalog environment didn't stabilize after %{tries} fetches, aborting run"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:356
+#: ../lib/puppet/configurer.rb:361
 msgid "Local environment: '%{local_env}' doesn't match server specified environment '%{catalog_env}', restarting agent run with environment '%{catalog_env}'"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:397
+#: ../lib/puppet/configurer.rb:402
 msgid "Failed to apply catalog: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:430 ../lib/puppet/http/resolver/server_list.rb:29
+#: ../lib/puppet/configurer.rb:431 ../lib/puppet/http/resolver/server_list.rb:89
 msgid "Puppet server %{host}:%{port} is unavailable: %{code} %{reason}"
 msgstr ""
 
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
-#: ../lib/puppet/configurer.rb:434 ../lib/puppet/http/resolver/server_list.rb:35
+#: ../lib/puppet/configurer.rb:435 ../lib/puppet/http/resolver/server_list.rb:95
 msgid "Unable to connect to server from server_list setting: %{detail}"
 msgstr ""
 
@@ -634,7 +630,7 @@ msgstr ""
 msgid "Could not retrieve catalog from cache: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/configurer.rb:535
+#: ../lib/puppet/configurer.rb:536
 msgid "Could not retrieve catalog from remote server: %{detail}"
 msgstr ""
 
@@ -642,7 +638,11 @@ msgstr ""
 msgid "Retrieving %{name}"
 msgstr ""
 
-#: ../lib/puppet/configurer/downloader.rb:20
+#: ../lib/puppet/configurer/downloader.rb:21
+msgid "Failed to retrieve %{name}: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/configurer/downloader.rb:32
 msgid "Could not retrieve %{name}: %{detail}"
 msgstr ""
 
@@ -666,20 +666,20 @@ msgstr ""
 msgid "Attempted to pop, but already at root of the context stack."
 msgstr ""
 
-#: ../lib/puppet/context/trusted_information.rb:58
+#: ../lib/puppet/context/trusted_information.rb:53
 msgid "TrustedInformation expected a certificate, but none was given."
 msgstr ""
 
-#: ../lib/puppet/context/trusted_information.rb:98 ../lib/puppet/parser/scope.rb:835
+#: ../lib/puppet/context/trusted_information.rb:104 ../lib/puppet/parser/scope.rb:835
 msgid "Unsupported data type: '%{klass}'"
 msgstr ""
 
-#: ../lib/puppet/daemon.rb:83
-msgid "Cannot reexec unless ARGV arguments are set"
+#: ../lib/puppet/daemon.rb:26
+msgid "Daemons must have an agent"
 msgstr ""
 
-#: ../lib/puppet/daemon.rb:144
-msgid "Daemons must have an agent, server, or both"
+#: ../lib/puppet/daemon.rb:81
+msgid "Cannot reexec unless ARGV arguments are set"
 msgstr ""
 
 #: ../lib/puppet/datatypes.rb:133
@@ -698,41 +698,46 @@ msgstr ""
 msgid "a data type can only have one implementation"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:171
+#: ../lib/puppet/defaults.rb:178
 msgid "Cannot disable unrecognized warning types '%{invalid}'."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:172
+#: ../lib/puppet/defaults.rb:179
 msgid "Valid values are '%{values}'."
 msgstr ""
 
 #. TRANSLATORS 'data_binding_terminus' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:540
+#: ../lib/puppet/defaults.rb:546
 msgid "Setting 'data_binding_terminus' is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'hiera' should not be translated
-#: ../lib/puppet/defaults.rb:542
+#: ../lib/puppet/defaults.rb:548
 msgid "Convert custom terminus to hiera 5 API."
 msgstr ""
 
 #. TRANSLATORS 'environment_data_provider' is a setting and should not be translated
-#: ../lib/puppet/defaults.rb:732
+#: ../lib/puppet/defaults.rb:747
 msgid "Setting 'environment_data_provider' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:813
+#: ../lib/puppet/defaults.rb:830
 msgid "Certificate names must be lower case"
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:998
+#: ../lib/puppet/defaults.rb:1024
 msgid "Setting 'ssl_client_ca_auth' is deprecated."
 msgstr ""
 
-#: ../lib/puppet/defaults.rb:1077 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
+#: ../lib/puppet/defaults.rb:1103 ../lib/puppet/settings/enum_setting.rb:13 ../lib/puppet/settings/symbolic_enum_setting.rb:14
 msgid "Invalid value '%{value}' for parameter %{name}. Allowed values are '%{allowed_values}'"
 msgstr ""
 
+#. TRANSLATORS 'pluginsync' is a setting and should not be translated
+#: ../lib/puppet/defaults.rb:1969
+msgid "Setting 'pluginsync' is deprecated."
+msgstr ""
+
 #: ../lib/puppet/error.rb:77
 msgid "Could not parse for environment %{environment}: %{message}"
 msgstr ""
@@ -1088,49 +1093,53 @@ msgstr ""
 msgid "The version of the subcommand for which to show help."
 msgstr ""
 
+#: ../lib/puppet/face/help.rb:28
+msgid "Whether to render the help text in ronn format."
+msgstr ""
+
 #. TRANSLATORS 'puppet help' is a command line and should not be translated
-#: ../lib/puppet/face/help.rb:37
+#: ../lib/puppet/face/help.rb:44
 msgid "The 'puppet help' command takes two (optional) arguments: a subcommand and an action"
 msgstr ""
 
 #. TRANSLATORS '--version' is a command line option and should not be translated
-#: ../lib/puppet/face/help.rb:47
+#: ../lib/puppet/face/help.rb:54
 msgid "Supplying a '--version' only makes sense when a Faces subcommand is given"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:55
+#: ../lib/puppet/face/help.rb:62
 msgid "The legacy subcommand '%{sub_command}' does not support supplying an action"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:76
+#: ../lib/puppet/face/help.rb:102
 msgid "Could not load help for the application %{application_name}."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:77 ../lib/puppet/face/help.rb:89
+#: ../lib/puppet/face/help.rb:103 ../lib/puppet/face/help.rb:115
 msgid "Please check the error logs for more information."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:79 ../lib/puppet/face/help.rb:91
+#: ../lib/puppet/face/help.rb:105 ../lib/puppet/face/help.rb:117
 msgid "Detail: \"%{detail}\""
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:88
+#: ../lib/puppet/face/help.rb:114
 msgid "Could not load help for the face %{face_name}."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:100
+#: ../lib/puppet/face/help.rb:126
 msgid "Unable to load action %{actionname} from %{face}"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:144
+#: ../lib/puppet/face/help.rb:170
 msgid "(Deprecated)"
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:147 ../lib/puppet/face/help.rb:159
+#: ../lib/puppet/face/help.rb:173 ../lib/puppet/face/help.rb:185
 msgid "!%{sub_command}! Subcommand unavailable due to error."
 msgstr ""
 
-#: ../lib/puppet/face/help.rb:148 ../lib/puppet/face/help.rb:160
+#: ../lib/puppet/face/help.rb:174 ../lib/puppet/face/help.rb:186
 msgid "Check error logs."
 msgstr ""
 
@@ -1287,15 +1296,19 @@ msgstr ""
 msgid "Search the Puppet Forge for a module."
 msgstr ""
 
-#: ../lib/puppet/face/module/search.rb:12
+#: ../lib/puppet/face/module/search.rb:14
 msgid "Array of module metadata hashes"
 msgstr ""
 
-#: ../lib/puppet/face/module/search.rb:22
+#: ../lib/puppet/face/module/search.rb:24
 msgid "<search_term>"
 msgstr ""
 
-#: ../lib/puppet/face/module/search.rb:34
+#: ../lib/puppet/face/module/search.rb:27
+msgid "This action has been deprecated. Please use the Puppet Forge to search for modules."
+msgstr ""
+
+#: ../lib/puppet/face/module/search.rb:37
 msgid "No results found for '%{term}'."
 msgstr ""
 
@@ -1758,7 +1771,7 @@ msgstr ""
 msgid "No task specified"
 msgstr ""
 
-#: ../lib/puppet/file_serving/terminus_selector.rb:29
+#: ../lib/puppet/file_serving/terminus_selector.rb:28
 msgid "URI protocol '%{protocol}' is not currently supported for file serving"
 msgstr ""
 
@@ -1778,11 +1791,11 @@ msgstr ""
 msgid "Timeout waiting for exclusive lock on %{path}"
 msgstr ""
 
-#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:127 ../lib/puppet/util.rb:681
+#: ../lib/puppet/file_system/jruby.rb:18 ../lib/puppet/file_system/windows.rb:127 ../lib/puppet/util.rb:706
 msgid "Is a directory: %{directory}"
 msgstr ""
 
-#: ../lib/puppet/file_system/memory_impl.rb:68
+#: ../lib/puppet/file_system/memory_impl.rb:81
 msgid "Unable to find registered object for %{path}"
 msgstr ""
 
@@ -1814,7 +1827,7 @@ msgstr ""
 msgid "unexpected prefix_suffix: %{value}"
 msgstr ""
 
-#: ../lib/puppet/file_system/uniquefile.rb:140
+#: ../lib/puppet/file_system/uniquefile.rb:136
 msgid "cannot generate temporary name using `%{basename}' under `%{tmpdir}'"
 msgstr ""
 
@@ -2075,6 +2088,10 @@ msgstr ""
 msgid "Unable to parse %{message}"
 msgstr ""
 
+#: ../lib/puppet/functions/eyaml_lookup_key.rb:93
+msgid "hiera-eyaml backend error decrypting %{data} when looking up %{key} in %{path}. Error was %{message}"
+msgstr ""
+
 #: ../lib/puppet/functions/floor.rb:27
 msgid "The floor() function's auto conversion of String to Float is deprecated - change to convert input before calling"
 msgstr ""
@@ -2222,27 +2239,27 @@ msgstr ""
 msgid "Try the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:32
+#: ../lib/puppet/http/client.rb:90
 msgid "Request to %{uri} timed out connect operation after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:34
+#: ../lib/puppet/http/client.rb:92
 msgid "Request to %{uri} timed out read operation after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:36
+#: ../lib/puppet/http/client.rb:94
 msgid "Request to %{uri} interrupted after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:42
+#: ../lib/puppet/http/client.rb:100
 msgid "Request to %{uri} failed after %{elapsed} seconds: %{message}"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:157
+#: ../lib/puppet/http/client.rb:326
 msgid "Sleeping for %{interval} seconds before retrying the request"
 msgstr ""
 
-#: ../lib/puppet/http/client.rb:198 ../lib/puppet/indirector/request.rb:142
+#: ../lib/puppet/http/client.rb:369 ../lib/puppet/indirector/request.rb:142
 msgid "HTTP REST queries cannot handle values of type '%{klass}'"
 msgstr ""
 
@@ -2254,24 +2271,32 @@ msgstr ""
 msgid "Too many HTTP retries for %{addr}"
 msgstr ""
 
-#: ../lib/puppet/http/redirector.rb:42
+#: ../lib/puppet/http/redirector.rb:78
 msgid "Location response header is missing"
 msgstr ""
 
-#: ../lib/puppet/http/redirector.rb:46
+#: ../lib/puppet/http/redirector.rb:82
 msgid "Location URI is invalid: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/http/retry_after_handler.rb:44
+#: ../lib/puppet/http/retry_after_handler.rb:83
 msgid "Failed to parse Retry-After header '%{retry_after}' as an integer or RFC 2822 date"
 msgstr ""
 
-#: ../lib/puppet/http/service.rb:66 ../lib/puppet/indirector/rest.rb:276
+#: ../lib/puppet/http/service.rb:119
+msgid "Ignoring extra header \"%{name}\" as it was previously set."
+msgstr ""
+
+#: ../lib/puppet/http/service.rb:122
+msgid "Ignoring extra header \"%{name}\" as it has no value."
+msgstr ""
+
+#: ../lib/puppet/http/service.rb:145 ../lib/puppet/indirector/rest.rb:288
 msgid "No content type in http response; cannot parse"
 msgstr ""
 
 #. TRANSLATORS "pson", "preferred_serialization_format", and "puppetserver" should not be translated
-#: ../lib/puppet/http/service/report.rb:31
+#: ../lib/puppet/http/service/report.rb:61
 msgid "To submit reports to a server running puppetserver %{server_version}, set preferred_serialization_format to pson"
 msgstr ""
 
@@ -2283,124 +2308,124 @@ msgstr ""
 msgid "Already handling indirection for %{current}; cannot also handle %{next}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:25
+#: ../lib/puppet/indirector/catalog/compiler.rb:26
 msgid "Facts but no fact format provided for %{request}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:28
+#: ../lib/puppet/indirector/catalog/compiler.rb:29
 msgid "Found facts"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:33
+#: ../lib/puppet/indirector/catalog/compiler.rb:34
 msgid "Catalog for %{request} was requested with fact definition for the wrong node (%{fact_name})."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:70
+#: ../lib/puppet/indirector/catalog/compiler.rb:71
 msgid "Setup server facts for compiling"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:94
+#: ../lib/puppet/indirector/catalog/compiler.rb:95
 msgid "Unsupported facts format"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:135
+#: ../lib/puppet/indirector/catalog/compiler.rb:136
 msgid "Not inlining absent resource"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:138
+#: ../lib/puppet/indirector/catalog/compiler.rb:139
 msgid "Not inlining resource without sources"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:141
+#: ../lib/puppet/indirector/catalog/compiler.rb:142
 msgid "Not inlining unsupported source scheme"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata (in this case we are not inlining)
-#: ../lib/puppet/indirector/catalog/compiler.rb:163
+#: ../lib/puppet/indirector/catalog/compiler.rb:164
 msgid "Not inlining file outside environment"
 msgstr ""
 
 #. TRANSLATORS Inlining refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:169
+#: ../lib/puppet/indirector/catalog/compiler.rb:170
 msgid "Inlining file metadata"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:257
+#: ../lib/puppet/indirector/catalog/compiler.rb:259
 msgid "Could not get metadata for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:278
+#: ../lib/puppet/indirector/catalog/compiler.rb:280
 msgid "Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:285
+#: ../lib/puppet/indirector/catalog/compiler.rb:287
 msgid "Compiled static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:286
+#: ../lib/puppet/indirector/catalog/compiler.rb:288
 msgid "Compiled static catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:288
+#: ../lib/puppet/indirector/catalog/compiler.rb:290
 msgid "Compiled static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:289
+#: ../lib/puppet/indirector/catalog/compiler.rb:291
 msgid "Compiled static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:294
+#: ../lib/puppet/indirector/catalog/compiler.rb:296
 msgid "Compiled catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:295
+#: ../lib/puppet/indirector/catalog/compiler.rb:297
 msgid "Compiled catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:297
+#: ../lib/puppet/indirector/catalog/compiler.rb:299
 msgid "Compiled catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:298
+#: ../lib/puppet/indirector/catalog/compiler.rb:300
 msgid "Compiled catalog for %{node}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:320
+#: ../lib/puppet/indirector/catalog/compiler.rb:322
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:322
+#: ../lib/puppet/indirector/catalog/compiler.rb:324
 msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment}"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:325
+#: ../lib/puppet/indirector/catalog/compiler.rb:327
 msgid "Inlined resource metadata into static catalog for %{node} in %%{seconds} seconds"
 msgstr ""
 
 #. TRANSLATORS Inlined refers to adding additional metadata
-#: ../lib/puppet/indirector/catalog/compiler.rb:327
+#: ../lib/puppet/indirector/catalog/compiler.rb:329
 msgid "Inlined resource metadata into static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:344
+#: ../lib/puppet/indirector/catalog/compiler.rb:346
 msgid "Found node information"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:352
+#: ../lib/puppet/indirector/catalog/compiler.rb:354
 msgid "Failed when searching for node %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:372
+#: ../lib/puppet/indirector/catalog/compiler.rb:374
 msgid "Invalid option use_node for a remote request"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:391
+#: ../lib/puppet/indirector/catalog/compiler.rb:393
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
@@ -2420,6 +2445,10 @@ msgstr ""
 msgid "Unable to serialize catalog to json, retrying with pson"
 msgstr ""
 
+#: ../lib/puppet/indirector/catalog/rest.rb:34 ../lib/puppet/indirector/facts/rest.rb:22 ../lib/puppet/indirector/file_content/rest.rb:33 ../lib/puppet/indirector/file_metadata/rest.rb:30 ../lib/puppet/indirector/node/rest.rb:25 ../lib/puppet/indirector/rest.rb:146 ../lib/puppet/indirector/status/rest.rb:21
+msgid "Find %{uri} resulted in 404 with the message: %{body}"
+msgstr ""
+
 #: ../lib/puppet/indirector/exec.rb:11
 msgid "Exec commands must be an array"
 msgstr ""
@@ -2520,7 +2549,7 @@ msgstr ""
 msgid "You cannot save facts to the code store; it is only used for getting facts from a remote device"
 msgstr ""
 
-#: ../lib/puppet/indirector/facts/rest.rb:8 ../lib/puppet/indirector/rest.rb:186
+#: ../lib/puppet/indirector/facts/rest.rb:30 ../lib/puppet/indirector/rest.rb:198
 msgid "PUT does not accept options"
 msgstr ""
 
@@ -2571,7 +2600,11 @@ msgstr ""
 msgid "Invalid checksum %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/indirector/file_metadata/http.rb:25
+#: ../lib/puppet/indirector/file_content/http.rb:14
+msgid "Puppet::Indirector::FileContent::Http is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/file_metadata/http.rb:31
 msgid "cannot lookup multiple files"
 msgstr ""
 
@@ -2584,12 +2617,12 @@ msgid "Could not find filesystem info for file '%{request}' in environment %{env
 msgstr ""
 
 #. TRANSLATORS "Hiera" is the name of a code library and should not be translated
-#: ../lib/puppet/indirector/hiera.rb:8
+#: ../lib/puppet/indirector/hiera.rb:12
 msgid "Hiera terminus not supported without hiera library"
 msgstr ""
 
 #. TRANSLATORS "merge" is a parameter name and should not be translated
-#: ../lib/puppet/indirector/hiera.rb:68
+#: ../lib/puppet/indirector/hiera.rb:72
 msgid "Unrecognized value for request 'merge' parameter: '%{merge}'"
 msgstr ""
 
@@ -2747,10 +2780,18 @@ msgstr ""
 msgid "No report named '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/indirector/report/rest.rb:17
+#: ../lib/puppet/indirector/report/rest.rb:36
 msgid "Server version %{version} does not accept reports in '%{format}', use `preferred_serialization_format=pson`"
 msgstr ""
 
+#: ../lib/puppet/indirector/report/yaml.rb:19
+msgid "replace_file mode: %{mode} is invalid"
+msgstr ""
+
+#: ../lib/puppet/indirector/report/yaml.rb:31 ../lib/puppet/indirector/yaml.rb:32
+msgid "Could not save %{indirection} %{request}: %{detail}"
+msgstr ""
+
 #: ../lib/puppet/indirector/request.rb:103
 msgid "Could not find indirection '%{indirection}'"
 msgstr ""
@@ -2764,6 +2805,11 @@ msgstr ""
 msgid "Selected server from first entry of the `server_list` setting: %{server}"
 msgstr ""
 
+#. TRANSLATORS 'server' is the name of a setting and should not be translated
+#: ../lib/puppet/indirector/request.rb:218
+msgid "Selected server from the `server` setting: %{server}"
+msgstr ""
+
 #. TRANSLATORS 'server_list' is the name of a setting and should not be translated
 #: ../lib/puppet/indirector/request.rb:231
 msgid "Selected port from the first entry of the `server_list` setting: %{port}"
@@ -2786,20 +2832,36 @@ msgstr ""
 msgid "Resource instance does not match request key"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:138
-msgid "Find %{uri} resulted in 404 with the message: %{body}"
+#: ../lib/puppet/indirector/rest.rb:115
+msgid "Puppet::Indirector::Rest#find is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:154
+msgid "Puppet::Indirector::Rest#head is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:167
+msgid "Puppet::Indirector::Rest#search is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
+#: ../lib/puppet/indirector/rest.rb:181
+msgid "Puppet::Indirector::Rest#destroy is deprecated. Use Puppet::HTTP::Client instead."
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:171
+#: ../lib/puppet/indirector/rest.rb:182
 msgid "DELETE does not accept options"
 msgstr ""
 
+#: ../lib/puppet/indirector/rest.rb:197
+msgid "Puppet::Indirector::Rest#save is deprecated. Use Puppet::HTTP::Client instead."
+msgstr ""
+
 #. TRANSLATORS "PSON" should not be translated
-#: ../lib/puppet/indirector/rest.rb:223
+#: ../lib/puppet/indirector/rest.rb:235
 msgid "Downgrading to PSON for future requests"
 msgstr ""
 
-#: ../lib/puppet/indirector/rest.rb:265 ../lib/puppet/rest/response.rb:31
+#: ../lib/puppet/indirector/rest.rb:277 ../lib/puppet/rest/response.rb:31
 msgid "Error %{code} on SERVER: %{returned_message}"
 msgstr ""
 
@@ -2871,10 +2933,6 @@ msgstr ""
 msgid "You can only save objects that respond to :name"
 msgstr ""
 
-#: ../lib/puppet/indirector/yaml.rb:32
-msgid "Could not save %{indirection} %{request}: %{detail}"
-msgstr ""
-
 #: ../lib/puppet/info_service/class_information_service.rb:18
 msgid "Given argument must be a Hash"
 msgstr ""
@@ -3143,26 +3201,26 @@ msgid "Option %{option} conflicts with existing option %{conflict} on %{action}"
 msgstr ""
 
 #. TRANSLATORS 'Puppet::Type.newtype' should not be translated
-#: ../lib/puppet/metatype/manager.rb:76
+#: ../lib/puppet/metatype/manager.rb:77
 msgid "Puppet::Type.newtype(%{name}) now expects a hash as the second argument, not %{argument}"
 msgstr ""
 
 #. TRANSLATORS 'new%{method}' will become a method name, do not translate this string
-#: ../lib/puppet/metatype/manager.rb:111
+#: ../lib/puppet/metatype/manager.rb:110
 msgid "'new%{method}' method already exists; skipping"
 msgstr ""
 
 #. TRANSLATORS 'puppet/type/%{name}' should not be translated
-#: ../lib/puppet/metatype/manager.rb:174
+#: ../lib/puppet/metatype/manager.rb:173
 msgid "Loaded puppet/type/%{name} but no class was created"
 msgstr ""
 
 #. TRANSLATORS 'metadata.json' is a specific file name and should not be translated.
-#: ../lib/puppet/module.rb:222
+#: ../lib/puppet/module.rb:221
 msgid "%{name} has an invalid and unparsable metadata.json file. The parse error: %{error}"
 msgstr ""
 
-#: ../lib/puppet/module.rb:468
+#: ../lib/puppet/module.rb:467
 msgid ""
 "        Invalid module name '%{name}'; module names must match either:\n"
 "        An installed module name (ex. modulename) matching the expression /^[a-z][a-z0-9_]*$/ -or-\n"
@@ -3902,26 +3960,50 @@ msgstr ""
 msgid "Not a valid indirection type"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:11
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:14
 msgid "%{env_name} is not a known environment"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:40
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:43
 msgid "Application %{application} assigns nodes to non-existent components: %{component_list}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:46
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:49
 msgid "Application %{application} has components without assigned nodes: %{component_list}"
 msgstr ""
 
-#: ../lib/puppet/network/http/api/master/v3/environment.rb:55
+#: ../lib/puppet/network/http/api/master/v3/environment.rb:58
 msgid "Application %{app} assigns multiple nodes to component %{comp}"
 msgstr ""
 
-#: ../lib/puppet/network/http/compression.rb:30 ../lib/puppet/network/http/compression.rb:43
+#: ../lib/puppet/network/http/compression.rb:23 ../lib/puppet/network/http/compression.rb:27
+msgid "Puppet::Network::HTTP::Compression::Active#uncompress_body is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:32 ../lib/puppet/network/http/compression.rb:46
 msgid "Unknown content encoding - %{encoding}"
 msgstr ""
 
+#: ../lib/puppet/network/http/compression.rb:37
+msgid "Puppet::Network::HTTP::Compression::Active#uncompress is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:77
+msgid "Puppet::Network::HTTP::Compression::ZlibAdapter#uncompress is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:104
+msgid "Puppet::Network::HTTP::Compression::None#uncompress_body is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:113
+msgid "Puppet::Network::HTTP::Compression::None#uncompress is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/compression.rb:120
+msgid "Puppet::Network::HTTP::Compression::IdentityAdapter#uncompress is deprecated."
+msgstr ""
+
 #: ../lib/puppet/network/http/connection.rb:56
 msgid "Unrecognized option(s): %{opts}"
 msgstr ""
@@ -3930,36 +4012,40 @@ msgstr ""
 msgid "Expected an instance of Puppet::SSL::Verifier but was passed a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:225
+#: ../lib/puppet/network/http/connection.rb:229 ../lib/puppet/network/http/connection_adapter.rb:174
 msgid "Too many HTTP redirections for %{host}:%{port}"
 msgstr ""
 
 #. TRANSLATORS: Used in the phrase:
 #. "Received a response from the remote server."
-#: ../lib/puppet/network/http/connection.rb:255
+#: ../lib/puppet/network/http/connection.rb:259
 msgid "the remote server"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:259
+#: ../lib/puppet/network/http/connection.rb:263
 msgid "Received a %{status_code} response from %{server_hostname}, but the Retry-After header value of \"%{retry_after}\" could not be converted to an integer or RFC 2822 date."
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:270
+#: ../lib/puppet/network/http/connection.rb:274
 msgid "Received a %{status_code} response from %{server_hostname}. Sleeping for %{retry_sleep} seconds before retrying the request."
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:331
+#: ../lib/puppet/network/http/connection.rb:335
 msgid "request %{uri} interrupted after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:333
+#: ../lib/puppet/network/http/connection.rb:337
 msgid "request %{uri} timed out after %{elapsed} seconds"
 msgstr ""
 
-#: ../lib/puppet/network/http/connection.rb:335
+#: ../lib/puppet/network/http/connection.rb:339
 msgid "request %{uri} failed: %{msg}"
 msgstr ""
 
+#: ../lib/puppet/network/http/connection.rb:346
+msgid "Puppet::Network::HTTP::Connection is deprecated. Please use Puppet::Network::HTTP::ConnectionAdapter instead."
+msgstr ""
+
 #: ../lib/puppet/network/http/error.rb:23
 msgid "Not Acceptable: %{message}"
 msgstr ""
@@ -4004,7 +4090,11 @@ msgstr ""
 msgid "Could not resolve %{ip}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/network/http/pool.rb:65
+#: ../lib/puppet/network/http/nocache_pool.rb:6
+msgid "Puppet::Network::HTTP::NoCachePool is deprecated."
+msgstr ""
+
+#: ../lib/puppet/network/http/pool.rb:66
 msgid "Failed to close connection for %{site}: %{detail}"
 msgstr ""
 
@@ -4021,12 +4111,12 @@ msgid "Missing required Accept header"
 msgstr ""
 
 #. TRANSLATORS 'ssl_context' is an argument and should not be translated
-#: ../lib/puppet/network/http_pool.rb:80
+#: ../lib/puppet/network/http_pool.rb:81
 msgid "An ssl_context is required when connecting to 'https://%{host}:%{port}'"
 msgstr ""
 
 #. TRANSLATORS 'ssl_context' is an argument and should not be translated
-#: ../lib/puppet/network/http_pool.rb:88
+#: ../lib/puppet/network/http_pool.rb:89
 msgid "An ssl_context is unnecessary when connecting to 'http://%{host}:%{port}' and will be ignored"
 msgstr ""
 
@@ -4078,11 +4168,11 @@ msgstr ""
 msgid "Trusted node data modified for node %{name}"
 msgstr ""
 
-#: ../lib/puppet/node/environment.rb:208
+#: ../lib/puppet/node/environment.rb:212
 msgid "The 'disable_per_environment_manifest' setting is true, and the '%{env_name}' environment has an environment.conf manifest that conflicts with the 'default_manifest' setting."
 msgstr ""
 
-#: ../lib/puppet/node/environment.rb:551 ../lib/puppet/pops/loaders.rb:298
+#: ../lib/puppet/node/environment.rb:562 ../lib/puppet/pops/loaders.rb:301
 msgid "Could not parse for environment %{env}: %{detail}"
 msgstr ""
 
@@ -4153,15 +4243,15 @@ msgstr ""
 msgid "Given value for '%{varname}' has illegal type - got: %{type}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:510
+#: ../lib/puppet/pal/pal_impl.rb:485
 msgid "Puppet Pal: %{what}"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:524
+#: ../lib/puppet/pal/pal_impl.rb:499
 msgid "Cannot use '%{a_term}' and '%{b_term}' at the same time"
 msgstr ""
 
-#: ../lib/puppet/pal/pal_impl.rb:531
+#: ../lib/puppet/pal/pal_impl.rb:506
 msgid "A block must be given"
 msgstr ""
 
@@ -4226,7 +4316,7 @@ msgstr ""
 msgid "Node inheritance is removed in Puppet 4.0.0. See http://links.puppet.com/puppet-node-inheritance-deprecation"
 msgstr ""
 
-#: ../lib/puppet/parser/ast/pops_bridge.rb:190
+#: ../lib/puppet/parser/ast/pops_bridge.rb:186
 msgid "Instantiating Resource with type checked parameters - scope is missing, skipping type checking."
 msgstr ""
 
@@ -4251,7 +4341,7 @@ msgid "For more information, see https://puppet.com/docs/puppet/latest/environme
 msgstr ""
 
 #. TRANSLATORS "stage" is a keyword in Puppet and should not be translated
-#: ../lib/puppet/parser/compiler.rb:98 ../lib/puppet/parser/environment_compiler.rb:134
+#: ../lib/puppet/parser/compiler.rb:98 ../lib/puppet/parser/environment_compiler.rb:137
 msgid "Only classes can set 'stage'; normal resources like %{resource} cannot change run stage"
 msgstr ""
 
@@ -4337,60 +4427,60 @@ msgstr ""
 msgid "Application %{app} maps component %{res} to multiple nodes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:357
+#: ../lib/puppet/parser/compiler.rb:367
+msgid "Could not find node statement with name 'default' or '%{names}'"
+msgstr ""
+
+#: ../lib/puppet/parser/compiler.rb:385
 msgid "No source for scope passed to evaluate_classes"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:373
+#: ../lib/puppet/parser/compiler.rb:401
 msgid "Could not find class %{name} for %{node}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:475
+#: ../lib/puppet/parser/compiler.rb:503
 msgid "Capability mapping error: %{kind} clause references nonexistent %{component_type} %{component_name}"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:502
-msgid "Could not find node statement with name 'default' or '%{names}'"
-msgstr ""
-
-#: ../lib/puppet/parser/compiler.rb:523
+#: ../lib/puppet/parser/compiler.rb:526
 msgid "Evaluated collections"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:538
+#: ../lib/puppet/parser/compiler.rb:541
 msgid "Evaluated definitions"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:567
+#: ../lib/puppet/parser/compiler.rb:570
 msgid "Iterated (%{count}) on generators"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:578
+#: ../lib/puppet/parser/compiler.rb:581
 msgid "Somehow looped more than 1000 times while evaluating host catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:610
+#: ../lib/puppet/parser/compiler.rb:613
 msgid "Could not find resource(s) %{resources} for overriding"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:621
+#: ../lib/puppet/parser/compiler.rb:624
 msgid "Failed to realize virtual resources %{resources}"
 msgstr ""
 
 #. TRANSLATORS "main" is a function name and should not be translated
-#: ../lib/puppet/parser/compiler.rb:654
+#: ../lib/puppet/parser/compiler.rb:657
 msgid "Couldn't find main"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler.rb:727
+#: ../lib/puppet/parser/compiler.rb:730
 msgid "For initializing compiler"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:17
+#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:19
 msgid "Capability '%{cap}' referenced by '%{param}' is never exported"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:56
+#: ../lib/puppet/parser/compiler/catalog_validator/env_relationship_validator.rb:58
 msgid "'%{value}' is exported by both '%{hash}' and '%{resource}'"
 msgstr ""
 
@@ -4402,95 +4492,95 @@ msgstr ""
 msgid "Could not find resource '%{res}' in parameter '%{param}'"
 msgstr ""
 
-#: ../lib/puppet/parser/compiler/catalog_validator/site_validator.rb:14
+#: ../lib/puppet/parser/compiler/catalog_validator/site_validator.rb:16
 msgid "Only application components can appear inside a site - %{res} is not allowed"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:12
+#: ../lib/puppet/parser/environment_compiler.rb:13
 msgid "%{detail} in environment %{env}"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:59
+#: ../lib/puppet/parser/environment_compiler.rb:62
 msgid "For compiling environment catalog %{env}"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:62
+#: ../lib/puppet/parser/environment_compiler.rb:65
 msgid "Env Compile: Created settings scope"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:64
+#: ../lib/puppet/parser/environment_compiler.rb:67
 msgid "Env Compile: Evaluated main"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:66
+#: ../lib/puppet/parser/environment_compiler.rb:69
 msgid "Env Compile: Evaluated site"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:68
+#: ../lib/puppet/parser/environment_compiler.rb:71
 msgid "Env Compile: Evaluated application instances"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:70
+#: ../lib/puppet/parser/environment_compiler.rb:73
 msgid "Env Compile: Prune"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:72
+#: ../lib/puppet/parser/environment_compiler.rb:75
 msgid "Env Compile: Validate Catalog pre-finish"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:76
+#: ../lib/puppet/parser/environment_compiler.rb:79
 msgid "Env Compile: Finished catalog"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:80
+#: ../lib/puppet/parser/environment_compiler.rb:83
 msgid "Env Compile: Validate Catalog final"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:156
+#: ../lib/puppet/parser/environment_compiler.rb:159
 msgid "Environment Compiler: Could not find a site definition to evaluate"
 msgstr ""
 
-#: ../lib/puppet/parser/environment_compiler.rb:162
+#: ../lib/puppet/parser/environment_compiler.rb:165
 msgid "Evaluated application %{resource}"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:42
+#: ../lib/puppet/parser/functions.rb:43
 msgid "The method 'Puppet::Parser::Functions.autoloader#loadall' is deprecated in favor of using 'Scope#call_function'."
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:50
+#: ../lib/puppet/parser/functions.rb:51
 msgid "The method 'Puppet::Parser::Functions.autoloader#load(\"%{name}\")' is deprecated in favor of using 'Scope#call_function'."
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:58
+#: ../lib/puppet/parser/functions.rb:59
 msgid "The method 'Puppet::Parser::Functions.autoloader#loaded?(\"%{name}\")' is deprecated in favor of using 'Scope#call_function'."
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:181
+#: ../lib/puppet/parser/functions.rb:186
 msgid "Overwriting previous definition for function %{name}"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:187
+#: ../lib/puppet/parser/functions.rb:192
 msgid "Invalid statement type %{type}"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:199
+#: ../lib/puppet/parser/functions.rb:204
 msgid "Called %{name}"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:202
+#: ../lib/puppet/parser/functions.rb:207
 msgid "%{name}(): Wrong number of arguments given (%{arg_count} for %{arity})"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:204
+#: ../lib/puppet/parser/functions.rb:209
 msgid "%{name}(): Wrong number of arguments given (%{arg_count} for minimum %{min_arg_count})"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:210
+#: ../lib/puppet/parser/functions.rb:215
 msgid "custom functions must be called with a single array that contains the arguments. For example, function_example([1]) instead of function_example(1)"
 msgstr ""
 
-#: ../lib/puppet/parser/functions.rb:309
+#: ../lib/puppet/parser/functions.rb:314
 msgid "%{name}() can only be called using the 4.x function API. See Scope#call_function"
 msgstr ""
 
@@ -4498,15 +4588,15 @@ msgstr ""
 msgid "Calling function_contain via the Scope class is deprecated. Use Scope#call_function instead"
 msgstr ""
 
-#: ../lib/puppet/parser/functions/create_resources.rb:56
+#: ../lib/puppet/parser/functions/create_resources.rb:60
 msgid "create_resources(): wrong number of arguments (%{count}; must be 2 or 3)"
 msgstr ""
 
-#: ../lib/puppet/parser/functions/create_resources.rb:57
+#: ../lib/puppet/parser/functions/create_resources.rb:61
 msgid "create_resources(): second argument must be a hash"
 msgstr ""
 
-#: ../lib/puppet/parser/functions/create_resources.rb:59
+#: ../lib/puppet/parser/functions/create_resources.rb:63
 msgid "create_resources(): third argument, if provided, must be a hash"
 msgstr ""
 
@@ -4620,23 +4710,23 @@ msgstr ""
 msgid "Attempt to reassign attribute '%{name}' in '%{resource}' caused by multiple consumed mappings to the same attribute"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:364
+#: ../lib/puppet/parser/resource.rb:365
 msgid "Parameter '%{name}' is already set on %{resource}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:367
+#: ../lib/puppet/parser/resource.rb:368
 msgid "Parameter '%{name}' is already set on %{resource} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:372
+#: ../lib/puppet/parser/resource.rb:373
 msgid "Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:375
+#: ../lib/puppet/parser/resource.rb:376
 msgid "Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/parser/resource.rb:414
+#: ../lib/puppet/parser/resource.rb:415
 msgid "Duplicate parameter '%{param}' for on %{resource}"
 msgstr ""
 
@@ -5662,6 +5752,10 @@ msgstr ""
 msgid "Failed to load: %{type_name}"
 msgstr ""
 
+#: ../lib/puppet/pops/issues.rb:925
+msgid "Use of the application-orchestration %{expr} is deprecated. See https://puppet.com/docs/puppet/5.5/deprecated_language.html"
+msgstr ""
+
 #: ../lib/puppet/pops/label_provider.rb:76
 msgid "<%{string}> does not appear to contain a word"
 msgstr ""
@@ -5829,23 +5923,23 @@ msgstr ""
 msgid "The code loaded from %{source_ref} contains additional logic - can only contain the type '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loaders.rb:32
+#: ../lib/puppet/pops/loaders.rb:34
 msgid "Attempt to redefine already initialized loaders for environment"
 msgstr ""
 
-#: ../lib/puppet/pops/loaders.rb:174
+#: ../lib/puppet/pops/loaders.rb:177
 msgid "Internal Error: Puppet Context ':loaders' missing"
 msgstr ""
 
-#: ../lib/puppet/pops/loaders.rb:188
+#: ../lib/puppet/pops/loaders.rb:191
 msgid "Unable to find loader named '%{loader_name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loaders.rb:209
+#: ../lib/puppet/pops/loaders.rb:212
 msgid "Internal Error: did not find public loader for module: '%{module_name}'"
 msgstr ""
 
-#: ../lib/puppet/pops/loaders.rb:255
+#: ../lib/puppet/pops/loaders.rb:258
 msgid "Internal Error: Attempt to redefine loader named '%{name}'"
 msgstr ""
 
@@ -6052,7 +6146,7 @@ msgstr ""
 msgid "digit expected"
 msgstr ""
 
-#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:434
+#: ../lib/puppet/pops/resource/resource_type_impl.rb:167 ../lib/puppet/type.rb:444
 msgid "you must specify title patterns when there are two or more key attributes"
 msgstr ""
 
@@ -6586,7 +6680,7 @@ msgstr ""
 msgid "GID must be an integer"
 msgstr ""
 
-#: ../lib/puppet/provider/group/groupadd.rb:42
+#: ../lib/puppet/provider/group/groupadd.rb:44
 msgid "GID %{resource} already exists, use allowdupe to force group creation"
 msgstr ""
 
@@ -6669,27 +6763,31 @@ msgstr ""
 msgid "Could not perform network device prefetch: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:37
+#: ../lib/puppet/provider/package/aix.rb:46
 msgid "The aix provider can only be used by root"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:79 ../lib/puppet/provider/package/nim.rb:53
+#: ../lib/puppet/provider/package/aix.rb:88 ../lib/puppet/provider/package/nim.rb:53
 msgid "Failed to uninstall package '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:86
+#: ../lib/puppet/provider/package/aix.rb:95
 msgid "A directory is required which will be used to find packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:98
+#: ../lib/puppet/provider/package/aix.rb:107
 msgid "aix package provider is unable to downgrade packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:118
+#: ../lib/puppet/provider/package/aix.rb:112
+msgid "Package '%{name}' is in a %{status} state and requires manual intervention"
+msgstr ""
+
+#: ../lib/puppet/provider/package/aix.rb:133
 msgid "Could not list installed Packages: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aix.rb:141 ../lib/puppet/provider/package/yum.rb:252
+#: ../lib/puppet/provider/package/aix.rb:156 ../lib/puppet/provider/package/yum.rb:332
 msgid "Tried to get latest on a missing package"
 msgstr ""
 
@@ -6705,23 +6803,23 @@ msgstr ""
 msgid "Mac OS X packages must specify a package source"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:43
+#: ../lib/puppet/provider/package/apt.rb:81
 msgid "/etc/apt/sources.list contains a cdrom source; not installing.  Use 'allowcdrom' to override this failure."
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:93 ../lib/puppet/provider/package/fink.rb:55
+#: ../lib/puppet/provider/package/apt.rb:163 ../lib/puppet/provider/package/fink.rb:55
 msgid "Could not find latest version"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:104 ../lib/puppet/provider/package/fink.rb:66
+#: ../lib/puppet/provider/package/apt.rb:174 ../lib/puppet/provider/package/fink.rb:66
 msgid "Preseeding %{response} to debconf-set-selections"
 msgstr ""
 
-#: ../lib/puppet/provider/package/apt.rb:108 ../lib/puppet/provider/package/fink.rb:70
+#: ../lib/puppet/provider/package/apt.rb:178 ../lib/puppet/provider/package/fink.rb:70
 msgid "No responsefile specified or non existent, not preseeding anything"
 msgstr ""
 
-#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:94 ../lib/puppet/provider/package/portupgrade.rb:152 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:232 ../lib/puppet/provider/package/zypper.rb:109
+#: ../lib/puppet/provider/package/aptitude.rb:21 ../lib/puppet/provider/package/ports.rb:20 ../lib/puppet/provider/package/portupgrade.rb:94 ../lib/puppet/provider/package/portupgrade.rb:152 ../lib/puppet/provider/package/rug.rb:28 ../lib/puppet/provider/package/up2date.rb:17 ../lib/puppet/provider/package/yum.rb:312 ../lib/puppet/provider/package/zypper.rb:146
 msgid "Could not find package %{name}"
 msgstr ""
 
@@ -6769,27 +6867,27 @@ msgstr ""
 msgid "source is defined but does not have trailing slash, ignoring %{source}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:95
+#: ../lib/puppet/provider/package/gem.rb:102
 msgid "Could not list gems: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:121
+#: ../lib/puppet/provider/package/gem.rb:128
 msgid "Could not match %{desc}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:170
+#: ../lib/puppet/provider/package/gem.rb:206
 msgid "Invalid source '%{uri}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:181
+#: ../lib/puppet/provider/package/gem.rb:217
 msgid "puppet:// URLs are not supported as gem sources"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:197
+#: ../lib/puppet/provider/package/gem.rb:233
 msgid "Could not install: %{output}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/gem.rb:223
+#: ../lib/puppet/provider/package/gem.rb:259
 msgid "Could not uninstall: %{output}"
 msgstr ""
 
@@ -6875,31 +6973,31 @@ msgstr ""
 msgid "Error getting installed packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:176
+#: ../lib/puppet/provider/package/pacman.rb:173
 msgid "%{resource_name} is a group, but allow_virtual is false."
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:203
+#: ../lib/puppet/provider/package/pacman.rb:200
 msgid "Refusing to uninstall package group %{resource_name}, because allow_virtual is false."
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:233
+#: ../lib/puppet/provider/package/pacman.rb:230
 msgid "Invalid source '%{source}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:242
+#: ../lib/puppet/provider/package/pacman.rb:239
 msgid "puppet:// URL is not supported by pacman"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:244
+#: ../lib/puppet/provider/package/pacman.rb:241
 msgid "Source %{source} is not supported by pacman"
 msgstr ""
 
-#: ../lib/puppet/provider/package/pacman.rb:254
+#: ../lib/puppet/provider/package/pacman.rb:251
 msgid "Refusing to install package group %{resource_name}, because allow_virtual is false."
 msgstr ""
 
-#: ../lib/puppet/provider/package/pip.rb:54
+#: ../lib/puppet/provider/package/pip.rb:58
 msgid "Cannot resolve pip version"
 msgstr ""
 
@@ -6995,11 +7093,11 @@ msgstr ""
 msgid "portversion.latest() - fatal error with portversion: %{output}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/rpm.rb:89
+#: ../lib/puppet/provider/package/rpm.rb:68
 msgid "Failed to list packages"
 msgstr ""
 
-#: ../lib/puppet/provider/package/rpm.rb:128 ../lib/puppet/provider/package/rpm.rb:141
+#: ../lib/puppet/provider/package/rpm.rb:107 ../lib/puppet/provider/package/rpm.rb:120
 msgid "RPMs must specify a package source"
 msgstr ""
 
@@ -7044,23 +7142,23 @@ msgstr ""
 msgid "Don't know how to install '%{source}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:29
+#: ../lib/puppet/provider/package/yum.rb:69
 msgid "The yum provider can only be used as root"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:83
+#: ../lib/puppet/provider/package/yum.rb:123
 msgid "Could not check for updates, '%{cmd} check-update' exited with %{status}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:117
+#: ../lib/puppet/provider/package/yum.rb:158
 msgid "Failed to parse package name and architecture from '%{pkgname}'"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:226
+#: ../lib/puppet/provider/package/yum.rb:306
 msgid "Could not find package %{wanted}"
 msgstr ""
 
-#: ../lib/puppet/provider/package/yum.rb:237
+#: ../lib/puppet/provider/package/yum.rb:317
 msgid "Failed to update to version %{should}, got version %{version} instead"
 msgstr ""
 
@@ -7134,35 +7232,35 @@ msgstr ""
 msgid "The %{service} service is incomplete so its status will be reported as :stopped. See `svcs -xv %{fmri}` for more details."
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:23
+#: ../lib/puppet/provider/service/windows.rb:22
 msgid "Cannot enable %{resource_name}, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:29
+#: ../lib/puppet/provider/service/windows.rb:28
 msgid "Cannot disable %{resource_name}, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:35
+#: ../lib/puppet/provider/service/windows.rb:34
 msgid "Cannot enable %{resource_name} for manual start, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:41
+#: ../lib/puppet/provider/service/windows.rb:40
 msgid "Cannot enable %{resource_name} for delayed start, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:61
+#: ../lib/puppet/provider/service/windows.rb:60
 msgid "Unknown start type: %{start_type}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:64
+#: ../lib/puppet/provider/service/windows.rb:63
 msgid "Cannot get start type %{resource_name}, error was: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:78
+#: ../lib/puppet/provider/service/windows.rb:77
 msgid "Will not start disabled service %{resource_name} without managing enable. Specify 'enable => false' to override."
 msgstr ""
 
-#: ../lib/puppet/provider/service/windows.rb:110
+#: ../lib/puppet/provider/service/windows.rb:109
 msgid "Unknown service state '%{current_state}' for service '%{resource_name}'"
 msgstr ""
 
@@ -7247,7 +7345,7 @@ msgstr ""
 msgid "You must pass a callback for non-NONE events"
 msgstr ""
 
-#: ../lib/puppet/reports/http.rb:35
+#: ../lib/puppet/reports/http.rb:40
 msgid "Unable to submit report to %{url} [%{code}] %{message}"
 msgstr ""
 
@@ -7304,11 +7402,11 @@ msgstr ""
 msgid "no parameter named '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:634
+#: ../lib/puppet/resource.rb:635
 msgid "No title provided and %{type} is not a valid resource reference"
 msgstr ""
 
-#: ../lib/puppet/resource.rb:708
+#: ../lib/puppet/resource.rb:709
 msgid "No set of title patterns matched the title \"%{title}\"."
 msgstr ""
 
@@ -7398,119 +7496,119 @@ msgstr ""
 msgid "Could not evaluate: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:78
+#: ../lib/puppet/resource/type.rb:81
 msgid "Invalid export in %{reference}: %{ex} is not a resource"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:79
+#: ../lib/puppet/resource/type.rb:82
 msgid "Invalid export in %{reference}: %{ex} is not a capability resource"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:83
+#: ../lib/puppet/resource/type.rb:86
 msgid "Resource type %{res_type} does not produce %{ex_type}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:144
+#: ../lib/puppet/resource/type.rb:147
 msgid "Invalid resource supertype '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:192
+#: ../lib/puppet/resource/type.rb:199
 msgid "%{name} is not a class; cannot add code to it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:193
+#: ../lib/puppet/resource/type.rb:200
 msgid "%{name} is not a class; cannot add code from it"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:197
+#: ../lib/puppet/resource/type.rb:204
 msgid "Cannot have code outside of a class/node/define because 'freeze_main' is enabled"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:201
+#: ../lib/puppet/resource/type.rb:208
 msgid "Cannot merge classes with different parent classes (%{name} => %{parent} vs. %{other_name} => %{other_parent})"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:232
+#: ../lib/puppet/resource/type.rb:239
 msgid "Cannot create resources for defined resource types"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:286
+#: ../lib/puppet/resource/type.rb:294
 msgid "The method Puppet::Resource::Type.assign_parameter_values is deprecated and will be removed in the next major release of Puppet."
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:302
+#: ../lib/puppet/resource/type.rb:310
 msgid "Could not find parent resource type '%{parent}' of type %{parent_type} in %{env}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:429
+#: ../lib/puppet/resource/type.rb:437
 msgid "Parameter '%{name}' is given a type, but is not a valid parameter."
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:432
+#: ../lib/puppet/resource/type.rb:440
 msgid "Parameter '%{name}' is given a type that is not a Puppet Type, got %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:474
+#: ../lib/puppet/resource/type.rb:482
 msgid "Could not find scope for %{class_name}"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:495
+#: ../lib/puppet/resource/type.rb:503
 msgid "%{param} is a metaparam; this value will inherit to all contained resources in the %{name} definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type.rb:497
+#: ../lib/puppet/resource/type.rb:505
 msgid "%{param} is a metaparameter; please choose another parameter name in the %{name} definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:70
+#: ../lib/puppet/resource/type_collection.rb:72
 msgid "Class '%{klass}' is already defined%{error}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:71
+#: ../lib/puppet/resource/type_collection.rb:73
 msgid "Definition '%{klass}' is already defined%{error}; cannot be redefined as a class"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:72
+#: ../lib/puppet/resource/type_collection.rb:74
 msgid "Application '%{klass}' is already defined%{error}; cannot be redefined as a class"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:103
+#: ../lib/puppet/resource/type_collection.rb:105
 msgid "Node '%{name}' is already defined%{error}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:111
+#: ../lib/puppet/resource/type_collection.rb:113
 msgid "Site is already defined%{error}; cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:148
+#: ../lib/puppet/resource/type_collection.rb:150
 msgid "'%{name}' is already defined%{error} as a class; cannot redefine as a definition"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:149
+#: ../lib/puppet/resource/type_collection.rb:151
 msgid "Definition '%{name}' is already defined%{error}; cannot be redefined"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:150 ../lib/puppet/resource/type_collection.rb:166
+#: ../lib/puppet/resource/type_collection.rb:152 ../lib/puppet/resource/type_collection.rb:168
 msgid "'%{name}' is already defined%{error} as an application; cannot be redefined"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:155
+#: ../lib/puppet/resource/type_collection.rb:157
 msgid "'%{name}' is already defined%{error} as a class; cannot redefine as a mapping"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:164
+#: ../lib/puppet/resource/type_collection.rb:166
 msgid "'%{name}' is already defined%{error} as a class; cannot redefine as an application"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:165
+#: ../lib/puppet/resource/type_collection.rb:167
 msgid "'%{name}' is already defined%{error} as a definition; cannot redefine as an application"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:218
+#: ../lib/puppet/resource/type_collection.rb:220
 msgid "Execution of config_version command `%{cmd}` failed: %{message}"
 msgstr ""
 
-#: ../lib/puppet/resource/type_collection.rb:238
+#: ../lib/puppet/resource/type_collection.rb:241
 msgid "Not attempting to load %{type} %{fqname} as this object was missing during a prior compilation"
 msgstr ""
 
@@ -7530,73 +7628,73 @@ msgstr ""
 msgid "Downloaded existing certificate request for %{name} from %{server}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:97
+#: ../lib/puppet/settings.rb:98
 msgid "New environment loaders generated from the requested section."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:299
+#: ../lib/puppet/settings.rb:300
 msgid "Attempting to initialize global default settings more than once!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:499
+#: ../lib/puppet/settings.rb:500
 msgid "Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:641
+#: ../lib/puppet/settings.rb:642
 msgid "Could not load %{file}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:746
+#: ../lib/puppet/settings.rb:748
 msgid "Invalid setting type '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:892
+#: ../lib/puppet/settings.rb:894
 msgid "Unknown searchpath case: %{source_type} for the %{source} settings path element."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:955
+#: ../lib/puppet/settings.rb:957
 msgid "setting definition for '%{name}' is not a hash!"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:960
+#: ../lib/puppet/settings.rb:962
 msgid "Setting %{name} is already defined"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:966
+#: ../lib/puppet/settings.rb:968
 msgid "Setting %{name} is already using short name '%{short}'"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1225
+#: ../lib/puppet/settings.rb:1227
 msgid "Setting %{name} is deprecated."
 msgstr ""
 
 #. TRANSLATORS 'puppet.conf' is a file name and should not be translated
-#: ../lib/puppet/settings.rb:1230
+#: ../lib/puppet/settings.rb:1232
 msgid "Setting %{name} is deprecated in puppet.conf."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1399
+#: ../lib/puppet/settings.rb:1403
 msgid "Error converting value for param '%{name}': %{detail}"
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1423
+#: ../lib/puppet/settings.rb:1427
 msgid "Could not find value for %{expression}"
 msgstr ""
 
 #. TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
-#: ../lib/puppet/settings.rb:1433
+#: ../lib/puppet/settings.rb:1437
 msgid "You cannot interpolate $environment within '%{setting_name}' when using directory environments."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1434
+#: ../lib/puppet/settings.rb:1438
 msgid "Its value will remain %{value}."
 msgstr ""
 
-#: ../lib/puppet/settings.rb:1465
+#: ../lib/puppet/settings.rb:1469
 msgid "Attempt to assign a value to unknown setting %{name}"
 msgstr ""
 
-#: ../lib/puppet/settings/array_setting.rb:14
+#: ../lib/puppet/settings/array_setting.rb:14 ../lib/puppet/settings/http_extra_headers_setting.rb:21
 msgid "Expected an Array or String, got a %{klass}"
 msgstr ""
 
@@ -7710,6 +7808,10 @@ msgstr ""
 msgid "The %{parameter} parameter for the setting '%{name}' must be either 'root' or 'service', not '%{value}'"
 msgstr ""
 
+#: ../lib/puppet/settings/http_extra_headers_setting.rb:12
+msgid "Expected an Array, String, or Hash, got a %{klass}"
+msgstr ""
+
 #: ../lib/puppet/settings/priority_setting.rb:39
 msgid "Invalid priority format '%{value}' for parameter: %{name}"
 msgstr ""
@@ -7922,99 +8024,107 @@ msgstr ""
 msgid "Could not download host certificate: %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/oids.rb:109
+#: ../lib/puppet/ssl/oids.rb:110
 msgid "Error loading ssl custom OIDs mapping file from '%{custom_oid_file}': %{err}"
 msgstr ""
 
-#: ../lib/puppet/ssl/oids.rb:113
+#: ../lib/puppet/ssl/oids.rb:114
 msgid "Error loading ssl custom OIDs mapping file from '%{custom_oid_file}': no such index '%{map_key}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/oids.rb:117
+#: ../lib/puppet/ssl/oids.rb:118
 msgid "Error loading ssl custom OIDs mapping file from '%{custom_oid_file}': data under index '%{map_key}' must be a Hash"
 msgstr ""
 
-#: ../lib/puppet/ssl/oids.rb:124
+#: ../lib/puppet/ssl/oids.rb:125
 msgid "Error loading ssl custom OIDs mapping file from '%{custom_oid_file}': incomplete definition of oid '%{oid}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/oids.rb:156
+#: ../lib/puppet/ssl/oids.rb:157
 msgid "Error registering ssl custom OIDs mapping from file '%{custom_oid_file}': %{err}"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:85
+#: ../lib/puppet/ssl/ssl_provider.rb:66
+msgid "Failed to add '%{path}' as a trusted CA file: %{detail}"
+msgstr ""
+
+#: ../lib/puppet/ssl/ssl_provider.rb:70
+msgid "The 'ssl_trust_store' setting does not refer to a file and will be ignored: '%{path}'"
+msgstr ""
+
+#: ../lib/puppet/ssl/ssl_provider.rb:104
 msgid "CA certs are missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:86
+#: ../lib/puppet/ssl/ssl_provider.rb:105
 msgid "CRLs are missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:87
+#: ../lib/puppet/ssl/ssl_provider.rb:106
 msgid "Private key is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:88
+#: ../lib/puppet/ssl/ssl_provider.rb:107
 msgid "Client cert is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:94
+#: ../lib/puppet/ssl/ssl_provider.rb:113
 msgid "Unsupported key '%{type}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:98
+#: ../lib/puppet/ssl/ssl_provider.rb:117
 msgid "The certificate for '%{name}' does not match its private key"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:137
+#: ../lib/puppet/ssl/ssl_provider.rb:156
 msgid "Failed to load private key for host '%{name}': %{message}"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:151
+#: ../lib/puppet/ssl/ssl_provider.rb:170
 msgid "The CSR for host '%{name}' does not match the public key"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:215
+#: ../lib/puppet/ssl/ssl_provider.rb:234
 msgid "The issuer '%{issuer}' of certificate '%{subject}' cannot be found locally"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:231
+#: ../lib/puppet/ssl/ssl_provider.rb:250
 msgid "The certificate '%{subject}' is not yet valid, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:233
+#: ../lib/puppet/ssl/ssl_provider.rb:252
 msgid "The certificate '%{subject}' has expired, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:235
+#: ../lib/puppet/ssl/ssl_provider.rb:254
 msgid "The CRL issued by '%{issuer}' is not yet valid, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:237
+#: ../lib/puppet/ssl/ssl_provider.rb:256
 msgid "The CRL issued by '%{issuer}' has expired, verify time is synchronized"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:239
+#: ../lib/puppet/ssl/ssl_provider.rb:258
 msgid "Invalid signature for certificate '%{subject}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:241
+#: ../lib/puppet/ssl/ssl_provider.rb:260
 msgid "Invalid signature for CRL issued by '%{issuer}'"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:243
+#: ../lib/puppet/ssl/ssl_provider.rb:262
 msgid "The issuer '%{issuer}' of certificate '%{subject}' is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:246
+#: ../lib/puppet/ssl/ssl_provider.rb:265
 msgid "The CRL issued by '%{issuer}' is missing"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:248
+#: ../lib/puppet/ssl/ssl_provider.rb:267
 msgid "Certificate '%{subject}' is revoked"
 msgstr ""
 
-#: ../lib/puppet/ssl/ssl_provider.rb:252
+#: ../lib/puppet/ssl/ssl_provider.rb:271
 msgid "Certificate '%{subject}' failed verification (%{err}): %{err_utf8}"
 msgstr ""
 
@@ -8098,20 +8208,24 @@ msgstr ""
 msgid "Couldn't fetch certificate from CA server; you might still need to sign this agent's certificate (%{name}). Exiting now because the maxwaitforcert timeout has been exceeded."
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:279
-msgid "Will try again in %{time} seconds."
+#: ../lib/puppet/ssl/state_machine.rb:305
+msgid "Another puppet instance is already running and the waitforlock setting is set to 0; exiting"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:379
-msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
+#: ../lib/puppet/ssl/state_machine.rb:307
+msgid "Another puppet instance is already running and the maxwaitforlock timeout has been exceeded; exiting"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:381
-msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
+#: ../lib/puppet/ssl/state_machine.rb:309
+msgid "Another puppet instance is already running; waiting for it to finish"
 msgstr ""
 
-#: ../lib/puppet/ssl/state_machine.rb:421
-msgid "Another puppet instance is already running; exiting"
+#: ../lib/puppet/ssl/state_machine.rb:427
+msgid "Verified client certificate '%{subject}' fingerprint %{digest}"
+msgstr ""
+
+#: ../lib/puppet/ssl/state_machine.rb:429
+msgid "Verified CA certificate '%{subject}' fingerprint %{digest}"
 msgstr ""
 
 #. TRANSLATORS: `error` is an untranslated message from openssl describing why a certificate in the server's chain is invalid, and `subject` is the identity/name of the failed certificate
@@ -8361,77 +8475,89 @@ msgstr ""
 msgid "audit change: newly-recorded value %s"
 msgstr ""
 
-#: ../lib/puppet/type.rb:509
+#: ../lib/puppet/trusted_external.rb:6
+msgid "Retrieving trusted external data from %{command}"
+msgstr ""
+
+#: ../lib/puppet/trusted_external.rb:20
+msgid "Skipping non-executable file %{file}"
+msgstr ""
+
+#: ../lib/puppet/trusted_external.rb:25
+msgid "There is more than one '%{basename}' script in %{dir}"
+msgstr ""
+
+#: ../lib/puppet/type.rb:519
 msgid "Options must be a hash, not %{type}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:512
+#: ../lib/puppet/type.rb:522
 msgid "Class %{class_name} already has a property named %{property}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:599
+#: ../lib/puppet/type.rb:609
 msgid "Class %{class_name} has not defined parameters"
 msgstr ""
 
-#: ../lib/puppet/type.rb:686
+#: ../lib/puppet/type.rb:696
 msgid "Parameter %{name} failed on %{ref}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:709
+#: ../lib/puppet/type.rb:719
 msgid "Undefined attribute '%{attribute}' in %{name}"
 msgstr ""
 
 #. TRANSLATORS 'is' is a variable name and should not be translated
 #. TRANSLATORS 'is' is a variable name and should not be translated
-#: ../lib/puppet/type.rb:1052 ../lib/puppet/type.rb:1063
+#: ../lib/puppet/type.rb:1062 ../lib/puppet/type.rb:1073
 msgid "The 'is' value is not in the 'is' array for '%{name}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1194
+#: ../lib/puppet/type.rb:1204
 msgid "%{name} has no providers and has not overridden 'instances'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1456
+#: ../lib/puppet/type.rb:1468
 msgid "Cannot add aliases without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1536
+#: ../lib/puppet/type.rb:1548
 msgid "Could not find %{description} %{ref} for %{resource}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1811
+#: ../lib/puppet/type.rb:1825
 msgid "Found multiple default providers for %{name}: %{provider_list}; using %{selected_provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1898
+#: ../lib/puppet/type.rb:1912
 msgid "Could not find parent provider %{parent} of %{name}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:1972
+#: ../lib/puppet/type.rb:1986
 msgid "Invalid %{resource} provider '%{provider_class}'"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2057
+#: ../lib/puppet/type.rb:2071
 msgid "Could not find %{name} provider of %{provider}"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2175
+#: ../lib/puppet/type.rb:2189
 msgid "You cannot add relationships without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type.rb:2479
+#: ../lib/puppet/type.rb:2492
 msgid "Unable to mark '%{name}' as sensitive: %{name} is a parameter and not a property, and cannot be automatically redacted."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2482
+#: ../lib/puppet/type.rb:2495
 msgid "Unable to mark '%{name}' as sensitive: the property itself was not assigned a value."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2484
+#: ../lib/puppet/type.rb:2497
 msgid "Unable to mark '%{name}' as sensitive: the property itself is not defined on %{type}."
 msgstr ""
 
-#: ../lib/puppet/type.rb:2542
+#: ../lib/puppet/type.rb:2555
 msgid "Could not set %{attribute} on %{class_name}: %{detail}"
 msgstr ""
 
@@ -8508,87 +8634,87 @@ msgstr ""
 msgid "File paths must be fully qualified, not '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:129
+#: ../lib/puppet/type/file.rb:142
 msgid "Invalid backup type %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:173 ../lib/puppet/type/tidy.rb:48
+#: ../lib/puppet/type/file.rb:186 ../lib/puppet/type/tidy.rb:48
 msgid "Invalid recurse value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:205
+#: ../lib/puppet/type/file.rb:218
 msgid "Invalid recurselimit value %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:401
+#: ../lib/puppet/type/file.rb:418
 msgid "You cannot specify more than one of %{creators}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:403
+#: ../lib/puppet/type/file.rb:420
 msgid "You cannot specify a remote recursion without a source"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:405
+#: ../lib/puppet/type/file.rb:422
 msgid "You cannot specify source when using checksum 'none'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:408
+#: ../lib/puppet/type/file.rb:425
 msgid "You cannot specify content when using checksum '%{checksum_type}'"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:411
+#: ../lib/puppet/type/file.rb:428
 msgid "Possible error: recurselimit is set but not recurse, no recursion will happen"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:419
+#: ../lib/puppet/type/file.rb:436
 msgid "Checksum value '%{value}' is not a valid checksum type %{checksum}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:422
+#: ../lib/puppet/type/file.rb:439
 msgid "Checksum value is ignored unless content or source are specified"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:460
+#: ../lib/puppet/type/file.rb:477
 msgid "Can not find filebucket for backups without a catalog"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:465
+#: ../lib/puppet/type/file.rb:482
 msgid "Could not find filebucket %{backup} specified in backup"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:763
+#: ../lib/puppet/type/file.rb:780
 msgid "Could not back up file of type %{current_type}"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:778
+#: ../lib/puppet/type/file.rb:795
 msgid "Could not remove files of type %{current_type}"
 msgstr ""
 
 #. TRANSLATORS "source_permissions => ignore" should not be translated
-#: ../lib/puppet/type/file.rb:789
+#: ../lib/puppet/type/file.rb:806
 msgid "Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore."
 msgstr ""
 
 #. TRANSLATORS "stat" is a program name and should not be translated
-#: ../lib/puppet/type/file.rb:870 ../lib/puppet/type/tidy.rb:352
+#: ../lib/puppet/type/file.rb:887 ../lib/puppet/type/tidy.rb:352
 msgid "Could not stat; permission denied"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:873
+#: ../lib/puppet/type/file.rb:890
 msgid "Could not stat; invalid pathname"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1001
+#: ../lib/puppet/type/file.rb:1018
 msgid "Not removing directory; use 'force' to override"
 msgstr ""
 
 #. TRANSLATORS refers to a file which could not be backed up
-#: ../lib/puppet/type/file.rb:1026
+#: ../lib/puppet/type/file.rb:1043
 msgid "Could not back up; will not remove"
 msgstr ""
 
-#: ../lib/puppet/type/file.rb:1040
-msgid "File written to disk did not match checksum; discarding changes (%{content_checksum} vs %{newsum})"
+#: ../lib/puppet/type/file.rb:1058
+msgid "File written to disk did not match desired checksum; discarding changes (%{content_checksum} vs %{desired_checksum})"
 msgstr ""
 
 #: ../lib/puppet/type/file/checksum.rb:20
@@ -8628,12 +8754,8 @@ msgstr ""
 msgid "Not managing symlink mode"
 msgstr ""
 
-#: ../lib/puppet/type/file/source.rb:135
-msgid "No source for content was stored with the metadata"
-msgstr ""
-
 #. TRANSLATORS "source_permissions" is a parameter name and should not be translated
-#: ../lib/puppet/type/file/source.rb:362
+#: ../lib/puppet/type/file/source.rb:368
 msgid "The `source_permissions` parameter is deprecated. Explicitly set `owner`, `group`, and `mode`."
 msgstr ""
 
@@ -8657,23 +8779,35 @@ msgstr ""
 msgid "Invalid GID %{gid}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:118 ../lib/puppet/type/package.rb:132
+#: ../lib/puppet/type/package.rb:128 ../lib/puppet/type/package.rb:142
 msgid "Could not update: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:167
+#: ../lib/puppet/type/package.rb:177
 msgid "Could not get latest version: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:267
+#: ../lib/puppet/type/package.rb:277
 msgid "Name must be a String not %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:649
+#: ../lib/puppet/type/package.rb:423
+msgid "Cannot have both `ensure => disabled` and `flavor`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:522
+msgid "Cannot have both `enable_only => true` and `flavor`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:525
+msgid "Cannot have both `ensure => disabled` and `enable_only => true`"
+msgstr ""
+
+#: ../lib/puppet/type/package.rb:687
 msgid "Invalid hold value %{value}. %{doc}"
 msgstr ""
 
-#: ../lib/puppet/type/package.rb:679
+#: ../lib/puppet/type/package.rb:717
 msgid "You cannot use \"mark\" property while \"ensure\" is one of [\"absent\", \"purged\", \"held\"]"
 msgstr ""
 
@@ -8733,7 +8867,15 @@ msgstr ""
 msgid "Setting enable to %{value} is only supported on Microsoft Windows."
 msgstr ""
 
-#: ../lib/puppet/type/service.rb:253
+#: ../lib/puppet/type/service.rb:162
+msgid "The 'logonaccount' parameter is mandatory when setting 'logonpassword'."
+msgstr ""
+
+#: ../lib/puppet/type/service.rb:163 ../lib/puppet/type/user.rb:256
+msgid "Passwords cannot include ':'"
+msgstr ""
+
+#: ../lib/puppet/type/service.rb:300
 msgid "\"%{value}\" is not a positive integer: the timeout parameter must be specified as a positive integer"
 msgstr ""
 
@@ -8772,10 +8914,6 @@ msgstr ""
 msgid "Could not find group(s) %{groups}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:256
-msgid "Passwords cannot include ':'"
-msgstr ""
-
 #: ../lib/puppet/type/user.rb:276
 msgid "Password minimum age must be provided as a number."
 msgstr ""
@@ -8806,55 +8944,47 @@ msgstr ""
 msgid "Expiry dates must be YYYY-MM-DD or the string \"absent\""
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:525
+#: ../lib/puppet/type/user.rb:506
 msgid "Role names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:527
+#: ../lib/puppet/type/user.rb:508
 msgid "Role names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:564
+#: ../lib/puppet/type/user.rb:545
 msgid "Auth names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:566
+#: ../lib/puppet/type/user.rb:547
 msgid "Auth names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:590
+#: ../lib/puppet/type/user.rb:571
 msgid "Profile names must be provided, not numbers"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:592
+#: ../lib/puppet/type/user.rb:573
 msgid "Profile names must be provided as an array, not a comma-separated list"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:703
+#: ../lib/puppet/type/user.rb:684
 msgid "Ssh_authorized_key type is not available. Cannot purge SSH keys."
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:741
+#: ../lib/puppet/type/user.rb:722
 msgid "Each entry for purge_ssh_keys must be a string, not a %{klass}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:744
+#: ../lib/puppet/type/user.rb:725
 msgid "Paths to keyfiles must be absolute, not %{entry}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:748
+#: ../lib/puppet/type/user.rb:729
 msgid "purge_ssh_keys must be true, false, or an array of file names, not %{value}"
 msgstr ""
 
-#: ../lib/puppet/type/user.rb:760
-msgid "purge_ssh_keys can only be true for users with a defined home directory"
-msgstr ""
-
-#: ../lib/puppet/type/user.rb:767
-msgid "purge_ssh_keys value '%{value}' meta character ~ or %{home_placeholder} only allowed for users with a defined home directory"
-msgstr ""
-
-#: ../lib/puppet/type/user.rb:782
+#: ../lib/puppet/type/user.rb:757
 msgid "Class name must be provided."
 msgstr ""
 
@@ -8905,23 +9035,23 @@ msgstr ""
 msgid "Couldn't expand PATH containing a ~ character; ignoring PATH element '%{dir}'."
 msgstr ""
 
-#: ../lib/puppet/util.rb:313
+#: ../lib/puppet/util.rb:318
 msgid "unknown platform %{platform} in absolute_path"
 msgstr ""
 
-#: ../lib/puppet/util.rb:348
+#: ../lib/puppet/util.rb:353
 msgid "Failed to convert '%{path}' to URI: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util.rb:448
+#: ../lib/puppet/util.rb:453
 msgid "path may not be nil"
 msgstr ""
 
-#: ../lib/puppet/util.rb:596
+#: ../lib/puppet/util.rb:621
 msgid "replace_file requires a block"
 msgstr ""
 
-#: ../lib/puppet/util.rb:600
+#: ../lib/puppet/util.rb:625
 msgid "replace_file default_mode: %{default_mode} is invalid"
 msgstr ""
 
@@ -8953,11 +9083,11 @@ msgstr ""
 msgid "Failed to abandon a child process contract"
 msgstr ""
 
-#: ../lib/puppet/util/autoload.rb:71
+#: ../lib/puppet/util/autoload.rb:75
 msgid "Could not autoload %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/autoload.rb:196
+#: ../lib/puppet/util/autoload.rb:182
 msgid "Autoload paths cannot be fully qualified"
 msgstr ""
 
@@ -8985,15 +9115,15 @@ msgstr ""
 msgid "Filebucketed %{f} to %{filebucket} with sum %{sum}"
 msgstr ""
 
-#: ../lib/puppet/util/character_encoding.rb:22
+#: ../lib/puppet/util/character_encoding.rb:23
 msgid "%{value} is already labeled as UTF-8 but this encoding is invalid. It cannot be transcoded by Puppet."
 msgstr ""
 
-#: ../lib/puppet/util/character_encoding.rb:43
+#: ../lib/puppet/util/character_encoding.rb:45
 msgid "%{error}: %{value} cannot be transcoded by Puppet."
 msgstr ""
 
-#: ../lib/puppet/util/character_encoding.rb:70
+#: ../lib/puppet/util/character_encoding.rb:73
 msgid "%{value} is not valid UTF-8 and result of overriding encoding would be invalid."
 msgstr ""
 
@@ -9381,7 +9511,7 @@ msgstr ""
 msgid "Section %{name} is already defined, cannot redefine"
 msgstr ""
 
-#: ../lib/puppet/util/instance_loader.rb:53
+#: ../lib/puppet/util/instance_loader.rb:56
 msgid "Loaded %{type} file for %{name} but %{type} was not defined"
 msgstr ""
 
@@ -9488,10 +9618,6 @@ msgstr ""
 msgid "Creating log directory %{dir}"
 msgstr ""
 
-#: ../lib/puppet/util/log/destinations.rb:102
-msgid "Unable to set ownership to %{user}:%{group} for log file: %{path}"
-msgstr ""
-
 #: ../lib/puppet/util/logging.rb:81 ../lib/puppet/util/logging.rb:105
 msgid "Wrapped exception:"
 msgstr ""
@@ -9529,6 +9655,10 @@ msgstr ""
 msgid "%{value} is an invalid url"
 msgstr ""
 
+#: ../lib/puppet/util/package/version/rpm.rb:40
+msgid "Cannot compare, as %{other} is not a Rpm Version"
+msgstr ""
+
 #: ../lib/puppet/util/plist.rb:48
 msgid "Cannot read file %{file_path}; Puppet is skipping it."
 msgstr ""
@@ -9773,11 +9903,11 @@ msgstr ""
 msgid "Cannot create group if user '%{name}' exists."
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:72
+#: ../lib/puppet/util/windows/api_types.rb:85
 msgid "Unable to read wide strings with %{null_terminator} terminal nulls"
 msgstr ""
 
-#: ../lib/puppet/util/windows/api_types.rb:203
+#: ../lib/puppet/util/windows/api_types.rb:216
 msgid "Bad GUID format."
 msgstr ""
 
@@ -9832,16 +9962,20 @@ msgstr ""
 msgid "Failed to call GetLongPathName"
 msgstr ""
 
-#: ../lib/puppet/util/windows/principal.rb:68 ../lib/puppet/util/windows/principal.rb:75
+#: ../lib/puppet/util/windows/principal.rb:67 ../lib/puppet/util/windows/principal.rb:74
 msgid "Failed to call LookupAccountNameW with account: %{account_name}"
 msgstr ""
 
 #. TRANSLATORS `lookup_account_sid` is a variable name and should not be translated
-#: ../lib/puppet/util/windows/principal.rb:98
+#: ../lib/puppet/util/windows/principal.rb:97
 msgid "Byte array for lookup_account_sid must not be nil and must be at least 1 byte long"
 msgstr ""
 
-#: ../lib/puppet/util/windows/principal.rb:120 ../lib/puppet/util/windows/principal.rb:127
+#: ../lib/puppet/util/windows/principal.rb:114
+msgid "Byte array for lookup_account_sid is invalid: %{sid_bytes}"
+msgstr ""
+
+#: ../lib/puppet/util/windows/principal.rb:122 ../lib/puppet/util/windows/principal.rb:129
 msgid "Failed to call LookupAccountSidW with bytes: %{sid_bytes}"
 msgstr ""
 
@@ -9849,23 +9983,23 @@ msgstr ""
 msgid "Failed to get child process exit code"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:285
+#: ../lib/puppet/util/windows/process.rb:286
 msgid "GetVersionEx failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:314
+#: ../lib/puppet/util/windows/process.rb:315
 msgid "Discarding environment variable %{string} which contains invalid bytes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:330
+#: ../lib/puppet/util/windows/process.rb:331
 msgid "environment variable name must not be nil or empty"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:335
+#: ../lib/puppet/util/windows/process.rb:336
 msgid "Failed to remove environment variable: %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/process.rb:340
+#: ../lib/puppet/util/windows/process.rb:341
 msgid "Failed to set environment variable: %{name}"
 msgstr ""
 
@@ -9877,39 +10011,39 @@ msgstr ""
 msgid "Failed to open registry key '%{key}\\%{path}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:130
+#: ../lib/puppet/util/windows/registry.rb:133
 msgid "Failed to enumerate %{key} registry keys at index %{index}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:161
+#: ../lib/puppet/util/windows/registry.rb:167
 msgid "Failed to enumerate %{key} registry values at index %{index}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:191
+#: ../lib/puppet/util/windows/registry.rb:197
 msgid "Failed to query registry %{key} for sizes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:227
+#: ../lib/puppet/util/windows/registry.rb:233
 msgid "Type mismatch (expect %{rtype} but %{type} present)"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:249
+#: ../lib/puppet/util/windows/registry.rb:255
 msgid "Type %{type} is not supported."
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:254
+#: ../lib/puppet/util/windows/registry.rb:260
 msgid "A value in the registry key %{parent_key_name}%{key} is corrupt or invalid"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:276
+#: ../lib/puppet/util/windows/registry.rb:282
 msgid "Failed to read registry value %{value} at %{key}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:294
+#: ../lib/puppet/util/windows/registry.rb:300
 msgid "Failed to delete registry value %{name} at %{key}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/registry.rb:309
+#: ../lib/puppet/util/windows/registry.rb:315
 msgid "Failed to delete registry key %{name} at %{key}"
 msgstr ""
 
@@ -9917,77 +10051,77 @@ msgstr ""
 msgid "Failed to import root certificate: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:173
+#: ../lib/puppet/util/windows/security.rb:174
 msgid "Failed to get volume information"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:339
+#: ../lib/puppet/util/windows/security.rb:340
 msgid "Setting control rights for %{path} owner SYSTEM to less than Full Control rights. Setting SYSTEM rights to less than Full Control may have unintented consequences for operations on this file"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:342
+#: ../lib/puppet/util/windows/security.rb:343
 msgid "%{path} owner and group both set to user SYSTEM, but group is not managed directly: SYSTEM user rights will be set to FullControl by group"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:345
+#: ../lib/puppet/util/windows/security.rb:346
 msgid "An attempt to set mode %{mode} on item %{path} would result in the owner, SYSTEM, to have less than Full Control rights. This attempt has been corrected to Full Control"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:355
+#: ../lib/puppet/util/windows/security.rb:356
 msgid "Setting control rights for %{path} group SYSTEM to less than Full Control rights. Setting SYSTEM rights to less than Full Control may have unintented consequences for operations on this file"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:358
+#: ../lib/puppet/util/windows/security.rb:359
 msgid "%{path} owner and group both set to user SYSTEM, but owner is not managed directly: SYSTEM user rights will be set to FullControl by owner"
 msgstr ""
 
 #. TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-#: ../lib/puppet/util/windows/security.rb:361
+#: ../lib/puppet/util/windows/security.rb:362
 msgid "An attempt to set mode %{mode} on item %{path} would result in the group, SYSTEM, to have less than Full Control rights. This attempt has been corrected to Full Control"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:432 ../lib/puppet/util/windows/security.rb:449 ../lib/puppet/util/windows/sid.rb:155 ../lib/puppet/util/windows/sid.rb:217 ../lib/puppet/util/windows/user.rb:43
+#: ../lib/puppet/util/windows/security.rb:433 ../lib/puppet/util/windows/security.rb:450 ../lib/puppet/util/windows/sid.rb:155 ../lib/puppet/util/windows/sid.rb:217 ../lib/puppet/util/windows/user.rb:59
 msgid "Invalid SID"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:436 ../lib/puppet/util/windows/security.rb:453
+#: ../lib/puppet/util/windows/security.rb:437 ../lib/puppet/util/windows/security.rb:454
 msgid "Failed to add access control entry"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:464 ../lib/puppet/util/windows/security.rb:646
+#: ../lib/puppet/util/windows/security.rb:465 ../lib/puppet/util/windows/security.rb:647
 msgid "Invalid DACL"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:487
+#: ../lib/puppet/util/windows/security.rb:488
 msgid "Unsupported access control entry type: 0x%{type}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:521
+#: ../lib/puppet/util/windows/security.rb:522
 msgid "Failed to open '%{path}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:568
+#: ../lib/puppet/util/windows/security.rb:569
 msgid "Failed to adjust process privileges"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:598
+#: ../lib/puppet/util/windows/security.rb:599
 msgid "Failed to get security information"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:609
+#: ../lib/puppet/util/windows/security.rb:610
 msgid "Failed to get security descriptor control"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:642
+#: ../lib/puppet/util/windows/security.rb:643
 msgid "Failed to initialize ACL"
 msgstr ""
 
-#: ../lib/puppet/util/windows/security.rb:681
+#: ../lib/puppet/util/windows/security.rb:682
 msgid "Failed to set security information"
 msgstr ""
 
@@ -10027,87 +10161,83 @@ msgstr ""
 msgid "Unknown start type '%{start_type}' for '%{service_name}'"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:453
-msgid "Unknown start type %{start_type}"
-msgstr ""
-
-#: ../lib/puppet/util/windows/service.rb:474
+#: ../lib/puppet/util/windows/service.rb:487
 msgid "Failed to update service configuration"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:535
+#: ../lib/puppet/util/windows/service.rb:552
 msgid "Failed to fetch services"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:584
+#: ../lib/puppet/util/windows/service.rb:601
 msgid "Failed to open a handle to the service"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:601
+#: ../lib/puppet/util/windows/service.rb:618
 msgid "Failed to open a handle to the service control manager"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:624
+#: ../lib/puppet/util/windows/service.rb:641
 msgid "The service is already in the %{final_state} state. No further work needs to be done."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:636
+#: ../lib/puppet/util/windows/service.rb:653
 msgid "The service must be in one of the %{valid_initial_states} states to perform this transition. It is currently in the %{current_state} state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:647
+#: ../lib/puppet/util/windows/service.rb:664
 msgid "There is already a pending transition to the %{final_state} state for the %{service_name} service."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:663
+#: ../lib/puppet/util/windows/service.rb:680
 msgid "The service is in the %{pending_state} state, which is an unsafe pending state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:668
+#: ../lib/puppet/util/windows/service.rb:685
 msgid "Transitioning the %{service_name} service from %{initial_state} to %{final_state}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:672
+#: ../lib/puppet/util/windows/service.rb:689
 msgid "Waiting for the transition to finish"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:677
+#: ../lib/puppet/util/windows/service.rb:694
 msgid "Failed to transition the %{service_name} service to the %{final_state} state. Detail: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:716 ../lib/puppet/util/windows/service.rb:752
+#: ../lib/puppet/util/windows/service.rb:733 ../lib/puppet/util/windows/service.rb:769
 msgid "Service query failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:795
+#: ../lib/puppet/util/windows/service.rb:812
 msgid "Service query for %{parameter_name} failed"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:818
+#: ../lib/puppet/util/windows/service.rb:835
 msgid "Failed to update service %{change} configuration"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:845
+#: ../lib/puppet/util/windows/service.rb:862
 msgid "Failed to send the %{control_signal} signal to the service. Its current state is %{current_state}. Reason for failure:"
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:880
+#: ../lib/puppet/util/windows/service.rb:897
 msgid "The service transitioned to the %{pending_state} state."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:894
+#: ../lib/puppet/util/windows/service.rb:911
 msgid "Timed out while waiting for the service to transition from %{initial_state} to %{final_state} OR from %{initial_state} to %{pending_state} to %{final_state}. The service's current state is %{current_state}."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:909
+#: ../lib/puppet/util/windows/service.rb:926
 msgid "Waiting for the pending transition to the %{final_state} state to finish."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:923
+#: ../lib/puppet/util/windows/service.rb:940
 msgid "Unexpected transition to the %{current_state} state while waiting for the pending transition from %{pending_state} to %{final_state} to finish."
 msgstr ""
 
-#: ../lib/puppet/util/windows/service.rb:937
+#: ../lib/puppet/util/windows/service.rb:954
 msgid "Timed out while waiting for the pending transition from %{pending_state} to %{final_state} to finish. The current state is %{current_state}."
 msgstr ""
 
@@ -10127,23 +10257,23 @@ msgstr ""
 msgid "Failed to convert string SID: %{string_sid}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/user.rb:38
+#: ../lib/puppet/util/windows/user.rb:54
 msgid "Failed to create administrators SID"
 msgstr ""
 
-#: ../lib/puppet/util/windows/user.rb:48
+#: ../lib/puppet/util/windows/user.rb:64
 msgid "Failed to check membership"
 msgstr ""
 
-#: ../lib/puppet/util/windows/user.rb:88
+#: ../lib/puppet/util/windows/user.rb:104
 msgid "Failed to logon user %{name}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/user.rb:120
+#: ../lib/puppet/util/windows/user.rb:135
 msgid "Failed to load user profile %{user}"
 msgstr ""
 
-#: ../lib/puppet/util/windows/user.rb:126
+#: ../lib/puppet/util/windows/user.rb:141
 msgid "Failed to unload user profile %{user}"
 msgstr ""