Merge branch 'tball/restore-050d148' - this merges PR https://github.com/opscode/chef/pull/2073 into master after the force-push shenanigans
WIP: lazy deep merging
remove lots of useless deep merge duping
remove cache resetting
fix ImmutableAttributeModification exception
fix reset_cache specs busted by removing that
add specs busted by dup removal
typo fix in specs
revert to serdar's deep_merge de-dup version
Merge pull request #2447 from opscode/lcg/lazy-deep-merge2

Lcg/lazy deep merge2
Merge remote-tracking branch 'upstream/master'