Merge "autotest: collect /proc/diskstats in tests"