Fix issue with UriBuilder creating Uris with extra cruft when certain pa...

...rts were empty.