Merge "Uri: check authority and scheme as part of determining URI path" into tm-dev