BVAL-444 Reinstate tck-testable that got lost
BVAL-450 Align @cValidateOnExecution and constraint wording around @Override methods