Merge branch 'master' of https://github.com/wangxp006/fio

* 'master' of https://github.com/wangxp006/fio:
  blktrace: fix three bugs in merge_blktrace_iologs path