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

[Simon Quigley]

Review: Needs Fixing

There's still some merge markers you need to remove.
-- 
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.