Polished UriComponents implementation
(cherry picked from commit c3b624d)
Removed unnecessary HttpUrlTemplate subclass of UriTemplate