Request GEODE-7537 fix to be cherry-picked into release 1.11

[Eric Shu]

Hello,

GEODE-7537 was highlighted as blocking 1.11 release. This issue is being
addressed now.

I would like to have this fix to be merged into release 1.11.

The commit sha is 3a3db82afdf0668e98ca49bcbdfa478e0ac94e10

Regards,
Eric