Update for enhancement of data_bag_item to fetch encrypted data bag items.
Merge pull request #1853 from opscode/mcquin/Issues-1849

Autodetect encrypted data bag items in data_bag_item dsl method.
Update to chef-zero 3
Look up username instead of resource name

The username isn't always the same as the resource name, and we incorrectly
use the latter when determining if the user exists in #load_current_resource.

Fixes #1705.
Make exception for a user not existing more explicit
unpack the conditionals a little for readability
Changelog update for #1705
Use path_join to create local-mode-cache
Always give config_dir a value
CHANGELOG.md for 1854
Merge pull request #1854 from opscode/lcg/config_dir

Use path_join to create local-mode-cache
CHEF-4101: DeepMerge - support overwriting hash values with nil
add CHANGELOG.md for PR#719
Merge pull request #1851 from opscode/lcg/chef-4101

CHEF-4101: DeepMerge - support overwriting hash values with nil
add retries in additional cases
Revert "add retries in additional cases"

Pushed straight to master again, I need to stop coding...

This reverts commit fb58236637095e22f25ed17143e435f4a58d7d6c.
Have freebsd port use pkg info if the freebsd version is >= 10000017
retry on HTTP 50X Error when calling Chef REST API
Add supermarket_attributes to Metadata

Allow the metadata.rb in a cookbook to specify arbitrary attributes for
use from Supermarket. The usecase for this right now would be setting the issues
and source URLs for that Cookbook instead of specifying them in the
Supermarket UI.
Fix typo in Metadata documentation.
Warn on using 'everything' for knife download on a hosted setup PR #1913