Updating to include 7951.
Merge pull request #5 from opscode/of/OC-7951

Updating to include 7951.
Update to omnibus 1.0.4 fixes [CHEF-4214].
Upgrade erchef to 1.2.15

This version of erchef includes a critical patch to depsolver
Prevent the release script from uploading .metadata.json
Pooler pool names are now atoms, not strings
Bump chef-pedant and erchef to pick up reindexing changes
Merge branch 'cm/OC-8302-reindex'
Use hh/OC-8557/request_logger branch of erchef
Added oc_wm_requst_logger config for erchef
Added req_id annotation to request log
Use erchef 1.2.18 (uses webmachine request logger)
Merge branch 'hh/OC-8557/request_logger'
Added improved request logging for erchef and bookshelf

 - bookshelf 0.2.6
 - Updated bookshelf configs
 - erchef 1.2.19
 - Updated erchef configs
Merge branch 'hh/OC-9093/reqid-logging'
Merge branch 'master' into working