CLC-1533 - Can "break" task date field with non-conforming date

https://jira.media.berkeley.edu/jira/browse/CLC-1533

Fixing merge conflict in Christian's original PR.