Merge branch 'fc/fast-export-persistent-marks' into pu

Seems to break a handful of topics when merged to the tip of 'pu'.

* fc/fast-export-persistent-marks:
  fast-export: don't parse commits while reading marks file
  fast-export: do not parse non-commit objects while reading marks file