[OEM-279] Fix reschedule comments not being kept on validation failure