[MERGE] Fix: use tracefile count current for index rotation

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