Fix long where int needed in commitlog segment.

Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-7199
Merge branch 'cassandra-2.1' into trunk