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

Lcg/lazy deep merge2
Conflicts:
	spec/unit/node/attribute_spec.rb