refs #7683. Update last IDF valid-to
refs #7683. Fix merge conflict.