Merge pull request #2447 from opscode/lcg/lazy-deep-merge2

Lcg/lazy deep merge2
Conflicts:
	spec/unit/node/attribute_spec.rb
Merge pull request #2454 from opscode/sersut/port-attr-perf

Merge pull request #2447 from opscode/lcg/lazy-deep-merge2