Merge commit '2.6.3rc2' into next

Manually resolved conflicts:
	lib/puppet/parser/ast/resource.rb
	spec/unit/parser/ast/resource_spec.rb

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/puppet/parser/ast/resource.rb b/lib/puppet/parser/ast/resource.rb
index bd15d9935..ce3c499c5 100644
--- a/lib/puppet/parser/ast/resource.rb
+++ b/lib/puppet/parser/ast/resource.rb
@@ -53,10 +53,11 @@ class Resource < AST::Branch
             :strict => true
           )
 
-          # And then store the resource in the compiler.
-          # At some point, we need to switch all of this to return
-          # resources instead of storing them like this.
+          if resource.resource_type.is_a? Puppet::Resource::Type
+            resource.resource_type.instantiate_resource(scope, resource)
+          end
           scope.compiler.add_resource(scope, resource)
+          scope.compiler.evaluate_classes([resource_title],scope,false) if fully_qualified_type == 'class'
           resource
         end
       }