Mark the importer tests as ones that needs memory cleaning, at least on Windows, this way we get some way further in being able to delete files at the end of the test
Make sure all BDB stores are destroyed, otherwise on Windows test will fail due to inability to delete files during cleanup
Merge remote-tracking branch 'upstream/master'