Minor change to fix errors in upcoming graphql gem upgrade

What does this MR do and why?

Minor changes/fixes to that can be made to main codebase that fixes problems in upcoming upgrade of graphql gem: [graphql] Convert to using the new query interp... (&7734 - closed) and #210556 (closed)

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.