Fix routing of CatchAll tokens (Bug #17960) - on master

This fixes https://bugzilla.xamarin.com/show_bug.cgi?id=17960, where catchall URL parameters were not being handled correctly. This is the same change as #911 except on `master` rather than `mono-3.2.8-branch`.