Merge pull request #12975 from sbagdat/fix-for-rake-routes

Fix for routes task
Conflicts:
	actionpack/CHANGELOG.md
	railties/test/application/rake_test.rb