[MERGE] don't rotate stream if count is zero

Signed-off-by: David Goulet <dgoulet@efficios.com>