Merge branch 'master' into feature/master/heredoc

Conflicts:
	lib/puppet/parser/ast/arithmetic_operator.rb
	lib/puppet/parser/e_parser_adapter.rb
	lib/puppet/parser/parser_factory.rb
	lib/puppet/parser/scope.rb
	spec/integration/parser/compiler_spec.rb
	spec/unit/parser/ast/arithmetic_operator_spec.rb
	spec/unit/pops/adaptable_spec.rb
	spec/unit/pops/containment_spec.rb
	spec/unit/pops/visitor_spec.rb