Ruggedized isPastOrCurrentDate.
Fixed merge conflict.