Resolve conflicting linter errors

Linter issues may only be reported once per line. This can cause cases where the code quality report will report an even number or issues fixed an introduced.

These changes addresses the simplest of either of the eight pairs of conflicting issues that were present in this MR !43 (merged)

This and gitlab-build-images!264 (merged) should help us to reduce noise in future MRs