Fix incorrect output from rails routes when using singular resources …
#27089

erickueen wants to merge erickueen:erickueen_fix_26606 into rails:master

We do not currently have an analysis of these two commits