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

Remove old knockout merge exception

Conflicts:
	spec/unit/mixin/deep_merge_spec.rb