While I'm here, I have a solution for the Akonadi issue in HTTP server mode. I also enhanced testing to cover Akonadi again (was disabled temporarily because the setup of Akonadi was no longer stable after parallelizing testing).