jrcportal #974 - pool gets exhausted due to improper resource handling
Merge remote-tracking branch 'tfrmaster/master' into connection-pool