BZ-8867 moved utility methods to UriUtils