Make demux and classify consistent

[harendra-kumar]

Classify does not restart a fold after it terminates whereas demux does. We should perhaps use the classify behavior in demux as well. This can be done easily by installing a drain fold after a fold is done.