feature/GEODE-6389b -> release/1.9.0

[Bruce Schuchardt]

I'm planning to merge the fix for 6389 to release/1.9.0 after it passes 
precheckin/review.

This fix is essential unless we back out the changes for GEODE-2113