(PUP-2878) file conflict upgrading from 2.7.26 to 3.6.2

Currently, upgrades from 2.7.26 to 3.6.2 break because of a file
conflict. It seems that as of Puppet 3.3.0, the manpages changed from
being owned by the puppet package, to being owned by the puppet-common
package. This change was initially done to allow upgrades from Debian
packages to ours. However, changing which package owns a given file
makes upgrades difficult. This commit adds in conflicts to allow smooth
upgrades from puppet packages prior to the manpage change to the current
version.
Merge pull request #2831 from melissaanne/ticket/stable/fix-conflict

(PUP-2878) file conflict upgrading from 2.7.26 to 3.6.2
(PUP-2944) Use osfamily to choose yum as a default

This commit changes the defaultfor from using the operatingsystem fact
to the osfamily fact. This is done so that we do not have to duplicate
effort of all the RedHat derivatives that use yum.

Signed-off-by: Charlie Sharpsteen <chuck@puppetlabs.com>
(PUP-2882) Fix single available upgrade

Prior to this commit `puppet module upgrade` would fail with an error message
about not being able to satisfy the upgrade when there is only one published
release of the module.
This commit changes the error message to say that there is no version to upgrade
to. This should reduce some user confusion.
Merge pull request #2883 from Sharpie/pup-2944-yum-osfamily

(PUP-2944) Use osfamily to choose yum as a default
(maint) Cleanup specs for the `module` Face’s `install` action.

Prior to this change, the specs relied on a fragile chain of stubbed
expectations, which changes elsewhere in the application have rendered
incorrect and non-operational.

This change aims to improve these specs by stubbing less and making
more robust assertions about the data.
Merge pull request #2898 from pvande/maint/stable/cleanup-module-install-spec

(maint) Cleanup specs for the `module` Face’s `install` action.
Merge branch 'stable'
(PUP-2943) Add PMT --ignore-changes

Prior to this commit there was no way to only ignore local changes to a module.
You had to --force when upgrading/uninstalling, which could potentially have other
repurcussions.
This commit adds the --ignore-changes flag, so a user can specify that they don't
care about local file changes but do not want to force anything else.
(PUP-2943) Uninstall/upgrade ignore changes spec

Adding more spec tests for the --ignore-changes flag on uninstall/upgrade
(PUP-2943) Clean ignore-changes uninstall logic
Merge pull request #2885 from highb/fix/master/pup-2882_upgrade_broken_for_one_version

(PUP-2882) Fix single available upgrade
(PUP-2943) Update acceptance tests

Update wording to reflect --ignore-changes flag suggestion instead of --force.
Merge pull request #2899 from highb/fix/stable/pup-2943_ignore_changes_flag

(PUP-2943) Add PMT --ignore-changes flag
(maint) Confine enc_provides_node_when_store_configs_enabled to debian

This test has a long history of being weaned from troublesome platforms
where there are issues getting the packages installed.  The latest problem
child is centos5, now that epel is not enabled on our vcloud templates
by default.  So I'm just confining the test here to run only on debian
(except lucid, which is another problem child for this test).  Since
activerecord is slated to be removed as a store_configs backend in Puppet
4, this test is on the chopping block soon regardless.
Merge branch 'maint/stable/confine-store-configs-to-debian' into stable

* maint/stable/confine-store-configs-to-debian:
  (maint) Confine enc_provides_node_when_store_configs_enabled to debian
Merge remote-tracking branch 'upstream/stable'

* upstream/stable:
  (maint) Confine enc_provides_node_when_store_configs_enabled to debian
  (PUP-2943) Update acceptance tests
  (PUP-2943) Clean ignore-changes uninstall logic
  (PUP-2943) Uninstall/upgrade ignore changes spec
  (PUP-2943) Add PMT --ignore-changes
Merge branch 'master' of https://github.com/puppetlabs/puppet