Merge "(bug 35658) make mw.Uri handle uris w/o protocol or host"