[OEM-279] Fix reschedule comments not being kept on validation failure
[OEM-279] Fix bad assumption
Merge branch 'master' into feature/glaucoma-2.1