Replaced call that triggers deprecated error
merged branch dlsniper/validator-deprecation (PR #6929)

This PR was merged into the master branch.

Commits
-------

d0341e8 Replaced call that triggers deprecated error

Discussion
----------

[Validator][ChoiceValidator] Replaced call that triggers deprecated error

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

This removes the deprecation warnings from the ChoiceValidator.