Merge "Move dumpstate to top -H rather than top -t."