Coding standard issues - #3472665

Aly Machacarequested to merge
issue/focal_point-3472665:3472665-coding-standard-issues into 2.x

Closes #3472665 - Coding standard issues

Merge request reports