Port 'Sort rows across books when aligning'

[Enkidu93]

Port any relevant changes in sillsdev/machine.py#309 from machine.py to machine.

[Enkidu93]

This cross-versification alignment bug actually will affect Serval, so we should prioritize getting this fix in.