[Deprecated] [ClassLoader] [Validator] Fix issues #12600 & #12682

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | 12600,12682
| License       | MIT
| Doc PR        | 
can soeone confirm the indent change?