After removing dnssec-settime calls that set key rollover relationship, we can adjust the counts in test output filenames. Also fix a couple of more wrong counts in output filenames. (cherry picked from commit 8204e31f0e)
8204e31f0e