[CONTINUUM-2204] Fix 'too many open files' exception merge 779982:779983 from continuum-1.3.x branch
[CONTINUUM-2204] Fix 'too many open files' exception
merge 779982:779983 from continuum-1.3.x branch

git-svn-id: 14f2065c7afdeb19086ae32a80b5e7aec819bae3@780214 13f79535-47bb-0310-9956-ffa450edef68

apache/continuum,apache/continuum,apache/continuum