SI-6803: do not use java.net.URI, even more so incorrectly.
Merge pull request #1787 from vigdorchik/si_6803

SI-6803: do not use java.net.URI, even more so incorrectly.