cbcollect_info lsof missing eventing and analytics

In the 5.5 Beta cbcollect runs the following,

echo moxi memcached beam.smp couch_compact godu sigar_port cbq-engine indexer projector goxdcr cbft eventing-producer | xargs -n1 pgrep | xargs -n1 -r – lsof -n -p

This doesn't pickup anything for eventing and analytics,  I believe that "eventing-producer" is too long so the truncated output doesn't pick get picked up on my Ubuntu 16 node and the consumer is missing.

Propose to change it to:

echo moxi memcached beam.smp couch_compact godu sigar_port cbq-engine indexer projector goxdcr cbft eventing-pr eventing-co cbas java | xargs -n1 pgrep | xargs -n1 -r – lsof -n -p

Included java to pick up the cbas processes, though that might pickup other non-cbas java processes, there might be a better way to do this . ?