Merge pull request #10646 from kennyj/fix_am_20130517

Fix ActionMailer testcase break with mail 2.5.4.
Conflicts:
	actionmailer/CHANGELOG.md
Add has_named_route? to the mapper API
Merge pull request #10672 from carllerche/master

Bug fix: Evented notification subscribers can handle published events
add test for scopes defined in abstract classes
merge named scopes into all so that they are associated with the correct class. Prevent duplicate where values when merging scopes