[Merge] ~wxl/kubuntu-packaging/+git/konversation:kubuntu_zesty_archive into ~kubuntu-packagers/kubuntu-packaging/+git/plasma-sdk:kubuntu_unstable

[Jose Manuel Santamaria Lema]

> There's still some merge markers you need to remove.

Actually this merge request is done against the wrong target
-- 
https://code.launchpad.net/~wxl/kubuntu-packaging/+git/konversation/+merge/312611
Your team Kubuntu Packagers is subscribed to branch ~kubuntu-packagers/kubuntu-packaging/+git/plasma-sdk:kubuntu_unstable.