Fix routing of CatchAll tokens (Bug #17960)

This fixes https://bugzilla.xamarin.com/show_bug.cgi?id=17960, where catchall URL parameters were not being handled correctly.

@pruiz