Coding standards Issue fixes.

Pravin Gaikwadrequested to merge
issue/gdpr-3314425:3314425-coding-standards-issue into 3.0.x

Closes #3314425

Merge request reports