(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>
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'
Merge branch 'master' into puppet-4