Make request URI in CANCEL match that of the original INVITE exactly (bug #2134)