Issue #3266572: Fix coding standards

sylvainm requested to merge issue/migrate_source_scald-3266572:3266572-fix-coding-standards into 1.0.x Feb 25, 2022