MANTA-17 fix a ref1-ref2 transition bug in the jump aligner
MANTA-17 misc brush-ups before full test