Merge pull request #134 from alexjfisher/type_is_valid_parameter_name

Fix for resources that have a parameter named `type`

Author: alexjfisher

lib/puppet/face/catalog/diff.rb

@@ -283,7 +283,7 @@
             value.map do |resource_id, resource|
               next if resource.nil?
 
-              if resource.is_a?(Hash) && resource.key?(:type)
+              if resource.is_a?(Hash) && resource.key?(:type) && !%i[params_in_old params_in_new].include?(header)
                 # If we find an actual resource print it out
                 format.resource_reference(header, resource_id, resource)
               elsif resource.is_a?(Array)