return vendor field and retab

This commit returns the vendor field to the facter
spec, which was lost in the transition to an erb
template. It also tabs in this section for clarity.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
(#16527) Fix processorcount fact on Solaris

Without this patch applied the processorcount fact on Solaris releases
without the kstat command produces the following error message:

    Could not retrieve processorcount: private method `scan' called for nil:NilClass

This is a problem because there is no clear path forward for the end
user.

This patch fixes the problem by switching the command executed to gather
the processor count from executing `kstat` to executing `psrinfo` for
Solaris kernel releases before 5.8.
Merge branch 'fix/1.6.x/16527_fix_processorcount_on_solaris' into 1.6.x

* fix/1.6.x/16527_fix_processorcount_on_solaris:
  (#16527) Fix processorcount fact on Solaris
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (#16527) Fix processorcount fact on Solaris
Merge branch '2.x'

* 2.x:
  (#16527) Fix processorcount fact on Solaris
(maint) Add newlines to all files (whitespace only)

Without this patch there are a number of files that do not have
newlines.  This is a problem because it makes it difficult to use
`perl -pl -i -e ...`
(maint) Add newlines to all files (whitespace only)

Without this patch there are a number of files that do not have
newlines.  This is a problem because it makes it difficult to use
`perl -pl -i -e ...`
(maint) Remove rspec from shebang lines

Without this patch Ruby 1.9 is still complaining loudly about trying to parse
the spec files.

I'd prefer to remove the shebang lines entirely, but doing so will cause
encoding errors in Ruby 1.9.  This patch strives for a happy middle ground of
convincing Ruby it is actually working with Ruby while not confusing it to
think it should exec() to rspec.

This patch is the result of the following command run against the source tree:

    find spec -type f -print0 | \
      xargs -0 perl -pl -i -e 's,^\#\!\s?/(.*)rspec,\#! /usr/bin/env ruby,'
(maint) Remove rspec from shebang lines

Without this patch Ruby 1.9 is still complaining loudly about trying to parse
the spec files.

I'd prefer to remove the shebang lines entirely, but doing so will cause
encoding errors in Ruby 1.9.  This patch strives for a happy middle ground of
convincing Ruby it is actually working with Ruby while not confusing it to
think it should exec() to rspec.

This patch is the result of the following command run against the source tree:

    find spec -type f -print0 | \
      xargs -0 perl -pl -i -e 's,^\#\!\s?/(.*)rspec,\#! /usr/bin/env ruby,'
Merge branch 'maint/1.6.x/cleanup' into 1.6.x

* maint/1.6.x/cleanup:
  (maint) Remove rspec from shebang lines
  (maint) Add newlines to all files (whitespace only)
Merge branch 'maint/2.x/cleanup' into 2.x

* maint/2.x/cleanup:
  (maint) Remove rspec from shebang lines
  (maint) Add newlines to all files (whitespace only)
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (maint) Remove rspec from shebang lines
  (maint) Add newlines to all files (whitespace only)
Merge branch '2.x'

* 2.x:
  (maint) Remove rspec from shebang lines
  (maint) Remove rspec from shebang lines
  (maint) Add newlines to all files (whitespace only)
  (maint) Add newlines to all files (whitespace only)
(maint) Add mailmap for git shortlog
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (maint) Add mailmap for git shortlog
Merge branch '2.x'

* 2.x:
  (maint) Add mailmap for git shortlog
(maint) Cleanup of the virtual spec tests.

Just some spacing issues and other minor things I'd like to straighten
up before trying to fix a bunch of tests.
(maint) Properly indent virtual_spec.rb
(#8210) Add a heavy virtual fact using virt-what

Without this patch facter does not return kvm when running inside of an
enterprise linux guest VM hosted on an enterprise linux kvm host.

This is a problem because facter improperly reports the virtual machine
is actually running on physical hardware, which is not true.  This
causes downstream problems for anyone relying on the virtual fact being
accurate.

This patch fixes the problem by adding a new resolver for the virtual
fact that has a very high weight.  The new resolver calls `virt-what`,
available on Enterprise Linux machines by installing the `virt-what`
package.  The last line of output is used to determine the virtual
machine hypervisor type.

If virt-what is not available or returns no output, then existing lower
weight resolvers are used instead.
Merge branch 'fix/1.6.x/8210_fix_virtual_fact_for_el_kvm_guests' into 1.6.x

* fix/1.6.x/8210_fix_virtual_fact_for_el_kvm_guests:
  (#8210) Add a heavy virtual fact using virt-what
  (maint) Properly indent virtual_spec.rb
  (maint) Cleanup of the virtual spec tests.