Merge pull request #506 from bytekast/BISERVER-8847

[BISERVER-9097] Use encodePathSegment instead of encodeQueryString when ...