Merge pull request #8555 from gcampbell12/gc/fix-agent_disabled_lockfile

(PUP-11000) Change agent_disabled_lockfile setting type to string

Author: joshcooper

lib/puppet/defaults.rb

@@ -1768,7 +1768,7 @@ def self.initialize_default_settings!(settings)
     },
     :agent_disabled_lockfile => {
         :default    => "$statedir/agent_disabled.lock",
-        :type       => :file,
+        :type       => :string,
         :desc       => "A lock file to indicate that puppet agent runs have been administratively
           disabled.  File contains a JSON object with state information.",
     },