[PROPOSAL] backport fix for GEODE-8574 to 1.13.1

[Jinmei Liao]

I would like to include the fix for GEODE-8574 to 1.13.1, it would greatly help 
the Geode on k8s experience.

Thanks!

Jinmei