Merge "Reduce duplication in bugreport ps output."