* 2.6.next:
  (#3420) Nagios "name" attribute does not output correctly
  (#4487) When setting environment on a host, ensure it is a string.
  add test for ticket 7101
  (#6487) Add some testing for OS X version support in DirectoryService provider
  (#6487) Directoryservice provider will fail in future OS releases

Before this change when environment strings were read out of the storeconfigs
database, they were eventually converted up to Puppet::Node::Environment
objects. When these objects are returned to the storeconfigs database,
ActiveRecord dumps them as YAML, which begins the death-spiral of YAML.

This change makes it so the host will always store the environment as a string,
preventing the Puppet::Node::Environment object from being YAMLized, and stored
as such in the database.

This change was based on one by Richard Crowley.

Paired-with: Jacob Helwig <jacob@puppetlabs.com>
Reviewed-by: Jesse Wolfe <jesse@puppetlabs.com>
Signed-off-by: Richard Crowley <r@rcrowley.org>

* 2.6.x:
  Updated CHANGELOG for 2.6.8rc1
  (#2331) Remove darwinports pkg provider, replace with rewritten macports provider
  Fixed #7082 - Added system support for groups
  (#7018) Give more context on the service type's assumptions. Wording tweaks.
  (#7018) explain internals better in service provider documentation
  maint: Fix sqlite3 require to really be optional
  maint: Fix sporadic sqlite error
  (#6818) Stop from getting Rails 3 named_scope deprecation warning
  (#6856) Copy dangling symlinks with 'links => manage' File resource.

Conflicts (Resolved manually):
	lib/puppet/type/group.rb
	spec/unit/indirector/facts/inventory_active_record_spec.rb

We want our Rails models in Puppet to work under Rails 2 or 3, but we
don't want the deprecation warnings since we can't control what version
of Rails the client is running.

DEPRECATION WARNING: Base.named_scope has been deprecated, please use
Base.scope instead

Reviewed-by: Nick Lewis <nick@puppetlabs.com>

Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Reviewed-by: Daniel Pittman <daniel@puppetlabs.com>

This terminus behaves the same on all supported DB platforms, by performing a
limited portion of its query in SQL, and the rest of the comparison in Ruby.
Its results are consistent with the YAML terminus.

Paired-With: Jesse Wolfe

This is not necessary because fact values are always strings, and it wasn't
doing the unnecessary job it was expected to do anyway.

This had been conflating hosts and nodes, when nodes is the most accurate.

Paired-With: Max Martin
Reviewed-By: Jacob Helwig

So far this terminus only supports find and save. Search is forthcoming. It
uses two new tables (inventory_host and inventory_facts) so that it won't
interact with storedconfigs.

Paired-With: Jacob Helwig