Merge branch 'feature/master/1481'

This merges in the new fileserving code -- we're now using
REST to do fileserving, rather than xmlrpc.

Conflicts:

	lib/puppet/parameter.rb
	lib/puppet/type/file.rb
	spec/unit/type/file.rb

1 files changed, 0 insertions, 1 deletions

diff --git a/bin/puppetd b/bin/puppetd
index c17654892..758494c4f 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -162,7 +162,6 @@ trap(:INT) do
 end
 
 require 'puppet'
-require 'puppet/executables/client/certhandler'
 require 'puppet/network/client'
 require 'getoptlong'