qa, pmns: tidy PMNS, PMDA filters for non-existant agents

qa/common.filter

@@ -357,12 +357,12 @@ _filter_optional_pmdas()
 	-e '/pmdastatsd/d' \
 	-e '/pmdasummary/d' \
 	-e '/pmdasystemd/d' \
-	-e '/pmdasystemtap/d' \
 	-e '/pmdasyb10/d' \
 	-e '/pmdasybping/d' \
 	-e '/pmdatrace/d' \
 	-e '/pmdatrivial/d' \
 	-e '/pmdatxmon/d' \
+	-e '/pmdauwsgi/d' \
 	-e '/pmdavmware/d' \
 	-e '/pmdawatch/d' \
 	-e '/pmdaweblog/d' \
@@ -424,6 +424,7 @@ _filter_optional_pmda_instances()
         -e '/inst \[152 or "netcheck"]/d' \
 	-e '/inst \[154 or "sockets"]/d' \
 	-e '/inst \[157 or "bpf"]/d' \
+	-e '/inst \[161 or "uwsgi"]/d' \
 	-e '/inst \[250 or "trivial"]/d' \
 
     # end
@@ -521,13 +522,12 @@ _filter_top_pmns()
 	-e '/^    summary /d' \
 	-e '/^    sybase /d' \
 	-e '/^    sybping /d' \
-	-e '/^    sysother /d' \
 	-e '/^    systemd /d' \
-	-e '/^    systemtap /d' \
 	-e '/^    trace /d' \
 	-e '/^    trivial /d' \
 	-e '/^    tty /d' \
 	-e '/^    txmon /d' \
+	-e '/^    uwsgi/d' \
 	-e '/^    vdo /d' \
 	-e '/^    vmware /d' \
 	-e '/^    web /d' \

src/pmns/stdpmid.pcp

@@ -67,7 +67,7 @@ CPUSET		84
 FREEBSD		85
 RPCBIND		86
 ETW		87
-SYSTEMTAP	88
+### FREE SLOTS ###
 MEMCACHE	89
 VMWARE		90
 IB		91
@@ -139,9 +139,9 @@ DENKI		156
 BPF		157
 OVERHEAD	158
 RESCTRL		159
-FARM	160 	/* Seagate vendor specific Field Accessible Reliability Metrics log */
+FARM		160 	/* Seagate vendor specific Field Accessible Reliability Metrics log */
 UWSGI		161
-### FREE SLOTS 161...240 ###
+### FREE SLOTS ###
 SCHIZO		241
 SLOW_PYTHON	242
 SLOW		243