Partial merge to 2.6.2rc1 : Merge commit '574812e' into next

The API for AST objects has changed, making the initialization of this
spec somewhat more complicated.
Also, git seems to have been confused by whitespace changes.

Manually Resolved Conflicts:
lib/puppet/parser/ast/resource.rb