Refactoring DistroFinder and updating versions for 2.11.0-M3.