One thing that might help track down the confusion as the one in the colored pic looks like a Riva. When you remove the cone above the outter
thread on the sleeve that the battery screws into. If it's a Riva it should have Riva etched into it. It's very light so you have to look close to see it but it's there, at least on mine.
As far as the cutoff, mine has one but no where near 6 seconds, It's more like 15 seconds. I would never have known the cutoff was there if I didn't try to do a dry burn with it once, not a good idea on any of these batts. I've got a pass through for that now.