OptionMerger no longer performs lambda merging

This reverts commit 9eaa0a3449595d07fe2ada5c4c93ec226622147c.

Conflicts:

	activesupport/test/option_merger_test.rb

Fixes #9805