GEODE-6662 for 1.9.0

[Bruce Schuchardt]

I'd like to include the fix for this memory leak that Darrel found.  
It's new in 1.9 and the fix is pretty simple - I'm putting up a PR now.