Fix an off by one error in CZML handling

When CZML packets have overlapping data within the same interval, we were improperly merging them together, resulting in out of order data.  I fixed the issue and added a unit test to cover it.