Revert "Attempt at fixing out of memory error - fixed closing of some streams."

This reverts commit abd7e02d726b359a6377bb443aa0e6550dffcf28.
Merge branch 'feature/query-service-refactor' of github.com:zenoss/query into feature/query-service-refactor