HPCC-11477 Activities are being reset excessively

Better fix for the issue that was partially fixed in 4.2.6

Also fix the case where a sink activity was still in reset state even though
there were upstream activities started.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>