SCRUM#500: Fix Linter errors

Stephanie Briere Americorequested to merge
issue/500 into develop

Merge request reports