(fact-155) Fix operatingsystemrelease for Solaris 11

The /etc/release file has changed from Solaris 10 to Solaris 11 and
because the regular expression does not match anymore the
operatingsystemrelease shows the kernelrelease fact on Solaris 11.

Change the regular expression to also identify Solaris 11
(fact-155) Add operatingsystemmajrelease fact for Solaris
Merge branch 'pull-594' into stable
Merge branch 'stable' into facter-2
Merge branch 'facter-2'

Conflicts:
	lib/facter/operatingsystemmajrelease.rb