Fix loose matching when validating route schemes.
Merge. Fix conflicts.