[PROPOSAL] Backport GEODE-8475 to 1.13

[Xiaojian Zhou]

Hi, All:

I want to backport my fix in GEODE-8475 to 1.13. It fixed a hang caused by a 
potential deadlock.

This fix is quite safe, I have verified it by running all queue related 
regression.

Regards
Gester