(maint) Update docs to reflect use of facter-2 branch

As we prepared for the release of Facter 2.0, we decided
to do that development on a facter-2 branch rather than
master. For details on this decision, see:

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

This commit reflects this change into the COMMITTERS.md and
CONTRIBUTING.md documents. It's mostly replacing 'master' with
'facter-2' in the appropriate places, but it also removes some
old assumptions, e.g. about per-release branches.
Merge pull request #641 from kylog/maint/update-contrib-docs-for-target-branch

(maint) Update docs to reflect use of facter-2 branch
Merge branch 'facter-2'

* facter-2:
  (maint) Update docs to reflect use of facter-2 branch
(FACT-234) Add blockdevice uuid fact

Add facts to show the uuid of partitions.

Looks for the partition of block devices found in /sys/block/<device>/<device>*
Then looks for the a link to the partition device in /dev/disk/by-uuid.  The link name is the UUID.

JIRA: FACT-234
(maint) Remove trailing spaces in blockdevices_spec
Merge branch 'feature/facter-2/patition_uuid_fact' into facter-2

* feature/facter-2/patition_uuid_fact:
  (maint) Remove trailing spaces in blockdevices_spec
  (FACT-234) Add blockdevice uuid fact
Merge branch 'facter-2'

* facter-2:
  (maint) Remove trailing spaces in blockdevices_spec
  (FACT-234) Add blockdevice uuid fact

Conflicts:
	lib/facter/blockdevices.rb
	spec/unit/blockdevices_spec.rb
(fact-234) Add newly defined blockdevice dynamic facts to the schema
Merge branch 'facter-2'

* facter-2:
  (fact-234) Add newly defined blockdevice dynamic facts to the schema
(FACT-341) - Added operatingsystemrelease support to Windows

Without this patch, the fact 'operatingsystemrelease' was set to
kernel version fact for all the windows flavors. This patchs brings
the option of having the common release name for the windows
machines, something that can help in writing specific puppet
manifests and other tasks according to the specific windows version.

The patch is based on a WMI call to Win32_OperatingSystem. This
aproach has some drawbacks but I think the code is simple and
easy to mantain and update. Anyway, extracting the windows version
is not an easy task for Microsoft as well:
http://msdn.microsoft.com/en-us/library/windows/desktop/ms724429%28v=vs.85%29.aspx

The original Redmine issue is (#7621)

Conflicts:
	lib/facter/operatingsystemrelease.rb
(Maint) Handle NoMethodError on 2003

Commit b5a4c68f1 modified the operatingsystemrelease fact to return more
meaningful Windows versions, e.g. 2003 instead of the kernelrelease fact
value, 5.2.3790. However, on (some?) non-R2 versions of 2003, the
othertypedescription method is not available on the WMI class
Win32_OperatingSystem[1].

As a result, facter would output to stderr the following message:

    Could not retrieve operatingsystemrelease: unknown property or method:
    `othertypedescription'
      HRESULT error code:0x80020006
        Unknown name.

This commit simply rescues the NoMethodError and outputs 2003.
Merge branch 'backport/facter-2/fact-341-windows-operatingsystemrelease-support' into facter-2
Merge branch 'facter-2'