Fix FilesCleaner module and Couch interactions.
Merge pull request #4201 from HassenRiahi/FixCleanerCompCouch

Fix FilesCleaner module and Couch interactions.