Merge branch 'feature/dune-2.5-not-3.0' into 'master'

Prepare for upstream version change from Dune 3.0 to 2.5

Should even work when they stick to version 3.0, but
not vice versa.

@hommel I propose to get this in 2.10.

See merge request !200