Back ported changes from DR-117.
Merge branch 'UriParseOptimize' into DR-117

Conflicts:
	src/tests/DreamMisc/XUriParser-Test.cs