XCOMMONS-689: URLTool doesn't preserve the order of the query string parameters