(FACT-607) Include facter man pages in the package for OSX.

Without this commit, the facter man page is not included in the package for OSX.

This commit adds the appropriate directives to ext/osx/file_mapping.yaml
to include facter man pages in the package for OSX.
Merge pull request #709 from geoffnichols/RE-830/facter-2/fix_man_page_osx

(FACT-607) Include facter man pages in the package for OSX.
puppetversion: Fix some English.

* There is no 'i' in 'requres'
* Its, not it's.
Merge branch 'pull-710' into facter-2
(FACT-606) Remove Sid/Unstable from build defaults

This commit goes through the build_defaults.yaml and removes the sid and
unstable entries. Part of the reason for this removal is the lack of
testing the build but still shipping the packages and we already
build against Debian tests.
(FACT-595) Unbreak {is_,}virtual fact for OpenBSD when running on KVM.
Merge pull request #714 from clantant/FACT-606/facter-2/sid

(FACT-606) Remove Sid/Unstable from build defaults
Merge pull request #716 from jasperla/openbsd/kvm

(FACT-595) Unbreak {is_,}virtual fact for OpenBSD when running on KVM.
(FACT-547) Limit the output of prtdiag on Solaris

prtdiag is used to determine manufacturer and productname on Solaris.

If you run it on a big box like a SPARC T5 it produces a lot of output,
and might take some time, this produces timeouts leading to missing facts.

The simple addition of a pipe to head avoid prtdiag to produce it full output.

The first lines should always contain the product information.
Merge branch 'pull-689' into facter-2
Merge branch 'facter-2'

Conflicts:
	ext/osx/file_mapping.yaml
	lib/facter/virtual.rb
(FACT-606) Remove Sid/Unstable from build defaults

This commit goes through the build_defaults.yaml and removes the sid and
unstable entries. Part of the reason for this removal is the lack of
testing the build but still shipping the packages and we already
build against Debian tests.
Merge branch 'stable' into facter-2
Merge branch 'facter-2'
(FACT-472) Sync facter-2 branch to master

This syncs facter-2 branch to master, i.e. leaves
master identical to facter-2. For background on this see:

https://groups.google.com/forum/#!msg/puppet-dev/Q24GLe6s1_4/hPwHgvVhnpIJ

Logistically, this was accomplished with the following:
  git diff master..facter-2 | git apply -
  git add --ignore-removal .
  git ls-files --deleted | xargs git rm
Revert "(maint) Update docs to reflect use of facter-2 branch"

This reverts commit 2600f04211d6316f78416ff1bfedcbb70a6f0bfd.
Merge pull request #717 from kylog/issue/fact-472/sync-facter-2-to-master

Issue/fact 472/sync facter 2 to master