Make sure that TimePeriod segments are being merged properly.

Refs #5268
Rename one of the example timeperiods.

Refs #5268
Merge branch 'feature/timeperiod-fixes-5268' into next

Fixes #5268