Fixed #752 : should use time-to-live instead of time-to-live-seconds
Fixed merge conflicts.