Add upgrade step
This fixes sort order index and adds sort criteria on new-style Collections
This refs affinitic #5898