Automatically convert dashes to underscores for url helpers
Automatically convert dashes to underscores in shorthand routes
Tidy up tests and CHANGELOG for #12598