#3546172 constraint annotations

Jonathan Smithrequested to merge
issue/scheduler-3546172:3546172-constraint-annotation into 2.x

Closes #3546172

Merge request reports