Correct overlapping IDF dates for TOSCAs

Refs #9699
Merge branch 'feature/9699_support_tfxa_and_tosca1' into develop