Merge pull request #2462 from opscode/lcg/remove-knockout-merge

remove old knockout merge exception
Conflicts:
	spec/unit/mixin/deep_merge_spec.rb
Merge pull request #2477 from opscode/sersut/port-immut-merge

Merge pull request #2462 from opscode/lcg/remove-knockout-merge