[Bug 1045936] kdepim4 maintenance update conflicts in kjots and akonadi/kdepim-addons