Issue #2928661 by kriboogh: Reordering taxonomy terms after "Reset to alphabetical" yields incorrect results upon save
Merged fixes by capysara from 10.1 into 11.x
Closes #2928661