Specific ordering of spiff merge files

[#65640230]

Signed-off-by: Mike Laming <mike@cloudcredo.com>