[Bug 513040] Fix KPackageKit and KPackage conflicts