Merge "Further reduce duplication in bugreport ps output."