Proposed fix for issue 594.

Proposed fix for issue 594.  UriBuilder will detect and escape necessary characters rather than simply blowing up as URI.create() does.