Cosmetic on doctests
Add SourcesManager to doctested modules
Perform a full restore before any test
Merge branch 'public' into 3000