Merge remote-tracking branch 'upstream/master' into stable

Prepare for 3.5.0-rc1

* upstream/master: (800 commits)
  (PUP-1085) Add and fix pacman provider tests
  (PUP-1905) Split modulepath when supplied as an override from CLI
  (PUP-1897) Improve test of EPP trim, and expr after params
  (PUP-1897) Fix failing lexer2 test, and update with additional tests
  (PUP-1897) Change epp lexer/grammar to only accept single rendered expr
  (PUP-979) Fix unparenthesized calls with hash to not give strange error
  (PUP-1897) Allow EPP render expression to render a block
  (maint) Remove dead-code check if ImportExpression is r-value
  (maint) Remove dead code checking non existing ImportExpression
  (PUP-1898) Fix reference to ArgumentException
  (PUP-1898) Fix broken exception raising when inline_epp gets non string
  (PUP-1895) Change <%( )%> to <%| |%> for EPP parameters
  (maint) Fix parallel:spec rake task when dependencies are not present.
  (Maint) Remove some duplication in tests
  (PUP-1885) Stringify ignores for file serving
  (PUP-1563) Don't recurse when dependencies are empty
  (PUP-1563) resolve_install_conflicts excessively recurses
  (maint) Add rake task for parallelizing specs.
  (PUP-30) Fix problem with changed behavior in StringScanner.scan_until
  (PUP-30) Add tests of inline_epp function
  ...
(maint) Update Debian dependencies for new debian-testing packages

In the Debian 'testing' release, the libopenssl-ruby virtual package has been
replaced with the libopenssl-ruby1.9.1 virtual package. The control
file for Debian packages has been updated to reflect this.
Merge pull request #2433 from mckern/stable

(maint) Update Debian dependencies for new debian-testing packages
Merge remote-tracking branch 'upstream/stable'

* upstream/stable:
  (maint) Update Debian dependencies for new debian-testing packages
Merge branch 'master' of https://github.com/puppetlabs/puppet