Merge branch 'maint_pmt_module_face_acceptance_failures'
Revert "Revert "Merge branch 'pull-1540'""

This reverts commit c992fb536d9fd87ad23b2fc0b88592bfe1dea0f5.
(#2251) Rewrite parsedfile method names for clarity

This renames the ParsedFile `self.find_resource` method to
`self.resource_for_record` and changes the method return to return the
resource found. It also adds some yardoc for the methods involved.
(#2251) add specs around resource_for_record
(maint) Mark parsedfile match_providers_with_resources as private
(#2251) correct crontab matching specs

The previous implementation of this spec was exhibiting failures on
windows and was testing behavior out of the scope of the unit test. This
narrows the scope of the given test.
(maint) Use stub over puppet type object

Using an object of class Puppet::Type::Cron is too error prone, as
instantiation of those objects have a lot of side effects. This replaces
the actual object with a stub to minimize the possible side effects.
Merge branch 'adrienthebo-maint-cron_refactor_resource_for_record'

* adrienthebo-maint-cron_refactor_resource_for_record:
  (maint) Use stub over puppet type object
  (#2251) correct crontab matching specs
  (maint) Mark parsedfile match_providers_with_resources as private
  (#2251) add specs around resource_for_record
  (#2251) Rewrite parsedfile method names for clarity
  Revert "Revert "Merge branch 'pull-1540'""

closes #1582
(maint) remove lines with only spaces
(maint) Update windows-api version in Gemfile

The windows-api gem will be seeing an update to 0.4.2 in puppet_for_the_win, so
this commit updates the gemfile to match that version.
Merge pull request #1588 from haus/maint/master/update_Gemfile

(maint) Update windows-api version in Gemfile
Merge pull request #1587 from haus/ticket/master/19138_19109_18985_fix_debian_package_dependencies

Ticket/master/19138 19109 18985 fix debian package dependencies
(maint) Fix iteration functions not behaving to spec for hash

When calling iteration functions collect, reject, and select with
a hash there were cases where only hash key was passed to the given
lambda. This commit corrects this by ensuring that it is always
a key/value tuple that is passed.

This commit also includes improved tests for these cases as well
as argument checking.
Merge branch 'master' of ssh://github.com/puppetlabs/puppet.git
(Maint) Revert dependency on debugger

Removed stray dependency on `debugger` gem.

Note you can add this dependency to `Gemfile.local` at the root of the
project, and that way you can still use bundler and not pollute the
Gemfile in git, e.g. fuubar.
(Maint) Cleanup trailing whitespace

Removed trailing whitespace only.
(maint) Readd execute permission to bin/puppet

While doing testing around GH-1582 I wound up using a shared filesystem
with Windows, which casually stomped the execute permission for
bin/puppet. This commit readds the execute bit.
Merge branch 'maint-execute_permission_bin_puppet'
(maint) Update rake spec code loading to match rspec

A shared behavior file located in spec/unit was getting loaded multiple
times if rake spec was invoked. The rspec default behavior loads all
files named *_spec.rb but the rake spec pattern was loading all ruby
files. This commit matches the rake spec behavior to match the rspec
behavior.
Merge branch 'maint-rake_spec_code_loading'