UT updates
Only pick up port from URI if it's local
Remove incorrectly-added Route headers