Reapply the TemplateFinder first applied in [8669] then reverted in [8676]. Closes #10800 [lifofifo]


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8683 5ecf4fe2-1ee6-0310-87b1-e25e094e27de