Fix ExternalAppModules not showing up

When the concept of "modules as categories" was implemented, it broke
inclusion of ExternalAppModules in two places.

(cherry picked from commit 98cf5ba4)

app/SettingsBase.cpp

@@ -282,7 +282,7 @@ void SettingsBase::initMenuList(MenuItem *parent)
             ? parent->service()->property(QStringLiteral("X-KDE-System-Settings-Category-Module")).toString()
             : QString();
 
-        if (parentCategoryKcm == entry->library()) {
+        if (!parentCategoryKcm.isEmpty() && parentCategoryKcm == entry->library()) {
             parent->setItem(KCModuleInfo(entry));
             removeList.append(modules.at(i));
         } else if (!parent->category().isEmpty() && (category == parent->category() || category2 == parent->category())) {

core/ModuleView.cpp

@@ -231,7 +231,7 @@ void ModuleView::loadModule(const QModelIndex &menuItem, const QStringList &args
 
     MenuItem *item = menuItem.data(Qt::UserRole).value<MenuItem *>();
 
-    if (!item->item().library().isEmpty()) {
+    if (!item->item().library().isEmpty() || !item->service()->exec().isEmpty()) {
         indexes << menuItem;
     }