Merge pull request #12746 from coreyward/master

Fix Hash#deep_merge bug and improve documentation — resolves #12738

Conflicts:
	activesupport/lib/active_support/core_ext/hash/deep_merge.rb
	activesupport/test/core_ext/hash_ext_test.rb