= servlet: Minor refactoring of the way the Uri is built from a HttpServletReqest