Updating FACTERVERSION to 1.6.15
Merge branch 'release/1.6.x/1.6.15' into 1.6.x
Merge branch '1.6.x' into 1.7.x
Merge branch '1.7.x' into 2.x

Conflicts:
	lib/facter/version.rb
Merge branch '2.x'
(#17487) Add support for HPUX NIC bonding in IP facts

Without this patch applied facter prints messages like

  $ facter
  Could not retrieve netmask_lan3_: undefined method `+' for nil:NilClass
  Could not retrieve macaddress_lan3_: undefined method `+' for nil:NilClass
  Could not retrieve network_lan3_: undefined method `+' for nil:NilClass
  Could not retrieve ipaddress6_lan3_: undefined method `+' for nil:NilClass
  Could not retrieve ipaddress_lan3_: undefined method `+' for nil:NilClass
  Could not retrieve mtu_lan3_: undefined method `+' for nil:NilClass
  ...
  interfaces => lan4_1,lan3_,lan1,lo0,lan4

The patch is a rewrite of Hongbo Hu's patch submitted in #11612 with sed
code implemented in Ruby.  The patch replaces the existing HP-UX unit tests
with an exhaustive selection of netstat -in, ifconfig, and lanscan examples
on various HP platforms with and without NIC bonding.

The patch also includes tests for MTU facts commented out as MTU facts have
not been implemented yet.  These can be uncommented after (#17808) is fixed.
(#17855) Rescue Timeout::Error

Previously, if the Facter::EC2.can_connect? method timed-out, an
instance of Timeout::Error would be raised. Under ruby 1.8.7, this class
is not a StandardError, and so wasn't rescued. And since the
can_connect? method is called when the ec2 code is loaded (as opposed to
a setcode block), the exception was never caught causing facter to exit.

In ruby 1.9.3, Timeout::Error is a StandardError, so the default
`rescue` block catches it.

This issue was caused by commit b336259e when trying to fix #17493.

This commit restores the explicit rescue of Timeout::Error so that it
behaves consistently on all supported ruby versions.
(#17854) Allow install.rb to execute from outside of source root

Previously if install.rb was invoked when outside of the source root, all of
the globs would fail to find bins, libs, etc, or worse if run from / it will
find the binaries in /bin and copy them to bindir. This commit addresses that
by running the install after cding into the directory containing the install.rb
file.
Merge pull request #363 from haus/ticket/1.7.x/17854_allow_install_from_outside_source_root

(#17854) Allow install.rb to execute from outside of source root
Remove unused code, globs from install.rb

The run_tests method and tests globs don't apply to facter, which has no test
directory, so this commit removes that method and its call. The rdoc globs
refrenced files which no longer exist, so they have been cleaned up and
existing files are left.
Add deprecation warning for --tests flag in install.rb

The tests flag does nothing in facter and has never been functional. This
commit removes some of the points where tests is set and also adds a
deprecation warning indicating that the tests flags will be removed in the
future. It also changes the default from on to off for InstallOptions.tests.
Merge pull request #364 from haus/maint/1.7.x/install_rb_cleanup

Remove unused code, globs from install.rb
Merge branch '1.7.x' into 2.x
Merge pull request #362 from joshcooper/ticket/1.6.x/17855-ec2-timeout-error

(#17855) Rescue Timeout::Error
Merge remote-tracking branch 'upstream/1.6.x' into 1.7.x

* upstream/1.6.x:
  (#17855) Rescue Timeout::Error
Merge remote-tracking branch 'upstream/1.7.x' into 2.x

* upstream/1.7.x:
  (#17855) Rescue Timeout::Error
Merge remote-tracking branch 'upstream/2.x'

* upstream/2.x:
  Add deprecation warning for --tests flag in install.rb
  Remove unused code, globs from install.rb
  (#17854) Allow install.rb to execute from outside of source root
  (#17855) Rescue Timeout::Error
Merge branch 'alexharv074-ticket/1.6.x/17487_bug_fix_for_HPUX_network_and_others' into 1.6.x

* alexharv074-ticket/1.6.x/17487_bug_fix_for_HPUX_network_and_others:
  (#17487) Add support for HPUX NIC bonding in IP facts
Merge branch '1.6.x' into 1.7.x

* 1.6.x:
  (#17487) Add support for HPUX NIC bonding in IP facts
Merge branch '1.7.x' into 2.x

* 1.7.x:
  (#17487) Add support for HPUX NIC bonding in IP facts