Merge "iotop: add major/minor fault stats"