Merge fix for #2288: do not quote + and @ characters when forming BaseRequest and HTTPRequest URL variables