Broken/Conflicting Tests in ActionPack

I've just put a new and improved form of the patch we've been discussing on the list into http://dev.rubyonrails.org/ticket/8714. I'd appreciate it if someone in core could review and, if there aren't any problems with it, apply it.

Thanks, - Matt