Fixed bug in UriTemplate normalization logic. Fixed bug in HttpClient member generation.