[Bug 981920] Merge KDE:Extra with main repo