Adapt to recent changes in the Dune core

Sander, Oliverrequested to merge
update-to-more-core-changes into master

A few deprecated macros have been removed there.

Merge request reports