Merge branch 'r9' into r9s

autocatalog.cfg

@@ -134,6 +134,8 @@ exclude_filter {
     glob_match: "kernel-rt*"
     glob_match: "javapackages-bootstrap"
     glob_match: "insights-client*"
+    glob_match: "nodejs-packaging"
+    glob_match: "nodejs-packaging-bundler"
   }
 }
 exclude_filter {
@@ -20725,9 +20727,7 @@ package {
     include_filter: "nodejs-nodemon.noarch"
   }
 }
-# This is technically a hidden dependency but ALSO a module package
-# don't know what to do about this. I guess we'll try to build during
-# lh
+# This is a hidden dep for non-modular nodejs
 package {
   name: "nodejs-packaging"
   type: PACKAGE_TYPE_NORMAL_FORK