Fix marking tasks as merged.
Fix marking tasks as merged.

Don't skip tasks with only one finished job.  This will then progress
through to the test of merge completeness and let lobster finish properly.

matz-e/lobster,matz-e/lobster,matz-e/lobster