Merge 2.10.x to master

The main area of conflict was `build.xml` (refactorings/bug fixes from 2.10.x + modularization from master).

I merged the MiMa targets into the master `build.xml`, but disabled their execution until 2.11.0.

Review by @adriaanm