Coding standards issue fixes.

Closes #3315882

Merge request reports

Loading