[JBTM-1767] Don't use UriInfo.toString to construct URIs
Merge branch 'JBTM-1767'