Consistent use of IllegalStateException instead of InternalError for UnsupportedEncodingException cause
(cherry picked from commit d9b39ad)
Minor UriComponentsBuilder javadoc revision
(cherry picked from commit 545c28f)