am 72960975: Migration update: ensuring all folders go first

* commit '72960975d8367e7ce789d8a5b6f0763fb0ec78bf':
  Migration update: ensuring all folders go first