As a followup to #9604, the 1.13.0 fix did not include support for scrubbing v3 fields in DiscoveryRequest when the transport protocol was v2. This was due to the fact that this was a no-op at the time. Prior to adding new v3 fields, we should add this support.