fix: #3590358 Upstream 5.0.0-rc1 compatibility changes

Al Munningsrequested to merge
issue/graphql_compose-3590358:3590358-upstream-5.0.0-rc1-compatibility into 3.0.x

By: camvertiz, almunnings

Closes #3590358

Edited by Al Munnings

Merge request reports