dune-istl-2.2.0 with modifications