#612 - Fix for intermittent cleaner test failures.
612 - Removing cleaner listener once the directory has been cleaned.
Merge remote-tracking branch 'simong/612-cleaner-failure'
Moving removeListener before fs.readdir to protect against exceptions