Ticket 60 bugfix
Fix checking that two engines are on the same token as well as in the same state before merging them, and a regression test that triggered the bug without the fix in place.
Fix checking that two engines are on the same token as well as in the same state before merging them, and a regression test that triggered the bug without the fix in place.