Stop pretending that v2 directories are a thing
V2Dir really means version 2 or higher.
Remove now obsolete backward compatibility and migration plans.
Merge remote-tracking branch 'karsten/bug8913'