Add skip_query_integration from upstream commit

[rebeccahum]

Description

Pulls in 10up#3273

Checklist

Please make sure the items below have been covered before requesting a review:

• This change works and has been tested locally (or has an appropriate fallback).
• This change works and has been tested on a Go sandbox.
• This change has relevant unit tests (if applicable).
• This change has relevant documentation additions / updates (if applicable).
• This change has the fix PRed upstream (if applicable). If not applicable, it has the relevant "// VIP: reason for the discrepancy with upstream" comment in places where the code is discrepant.

Steps to Test

[katag9k]

Tested on sandbox, works as expected