Merge branch '1.6.x'

* 1.6.x:
  (#14764) Stop calling enum_cpuinfo and enum_lsdev on unsuitable platforms
  (#16829) Change how bundler is detected
  Only load rubygems in bin/facter
  Update lib/facter/version.rb for 1.6.13
  Updating FACTERVERSION for facter 1.6.13-rc1
  Remove CHANGELOG from Facter
  Remove INSTALL from Facter
  Spec file cleanup
  Remove asc file a source for RPM builds
  Update default cows
  (maint) Update debian/rules to use new --ruby flag

Conflicts:
	CHANGELOG
	lib/facter/version.rb
Merge branch '2.x'

* 2.x:
Merge branch '2.x'

* 2.x:
  (#13535) Fix uptime; use `uptime` instead of `who -b`
Merge branch '2.x'

* 2.x:
  (#16506) Fix illegal option error from uname on hpux
Merge branch '2.x'

* 2.x:
  (#16526) Fix physicalprocessorcount fact on Solaris
Merge branch '2.x'

* 2.x:
  (#16527) Fix processorcount fact on Solaris
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)
Merge branch '2.x'

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

* 2.x:
  (#8210) Add a heavy virtual fact using virt-what
  (maint) Properly indent virtual_spec.rb
  (maint) Cleanup of the virtual spec tests.
Merge branch '2.x'

* 2.x:
  (maint) Remove bad test of manufacturer fact on Solaris
Merge branch '2.x'

* 2.x:
  (#11609) Fix processorX facts for AIX systems
  maint: Improve test coverage for osfamily fact
  maint: Remove trailing whitespace in osfamiliy fact
  (#17029) add osfamily Gentoo
Merge remote-tracking branch 'upstream/2.x'

* upstream/2.x:
  Maint: fix mismatched stub
  (#16397) Update selinux_mount_point for 1.8.5 compatibility
  return vendor field and retab
Merge branch '2.x'

* 2.x:
  (maint) Add .yardopts file
  Update lib/facter/version.rb for 1.6.14-rc1
  (Maint) Remove aliases for spec from Rakefile
Merge branch '2.x'

* 2.x:
  (#16511) Do not call arp -an on Solaris nodes
Merge branch '2.x'

* 2.x:
  (maint) Avoid "Use RbConfig instead of obsolete and deprecated Config" message
Merge branch '1.7.x'

* 1.7.x:
  (#11612) Add support for processorX facts on HP-UX
  Revert "Merge pull request #202 from hkenney/ticket/master/3226_strip_whitespace_from_fact"
  Revert "Merge pull request #208 from hkenney/ticket/master/14469_strip_whitespace_from_frozen_strings"
  Revert "Merge pull request #204 from jeffweiss/ticket/master/11466_remove_duplicate_memorytotal_fact"
  Revert "Merge pull request #205 from jeffweiss/ticket/master/12147_remove_iphostnumber_fact"
  Update lib/facter/version.rb for 1.6.14

Conflicts:
	CHANGELOG
	lib/facter/util/config.rb
	lib/facter/version.rb
	spec/unit/util/config_spec.rb
Merge remote-tracking branch 'upstream/2.x'

* upstream/2.x:
  install.rb doesn't support sbindir, so remove it from ips rules
  Turn on IPS building for facter
  Update ips ruby libdir to use sitelibdir instead of rubylibdir
  (#17493) Merge rescue blocks
  (#17493) Safer handling of EC2 'open' calls
  (Maint) Properly mock SunOS in test for manufacturer

Conflicts:
	CHANGELOG
Merge branch '2.x'

* 2.x:
  (#17177) Fix spec failure when running on Mac OS X
  Fixup whitespace in (#17177) Add MTU information to interfaces
  (#17177) Add MTU information to interfaces
Merge branch '2.x'

* 2.x:
  Improve Facter.version API to help automate releases
  (maint) Remove hard dependency on rspec from Rakefile
  (#17521) Modify spec to respect Archlinux osfamily
  (#17521) Add osfamily fact ArchLinux
Merge branch '2.x'

* 2.x:
  Add expectations for operatingsystemrelease on Ubuntu
  Add Facter::Util::FileRead.read helper method