Issue #3192110: Fix more coding standards

Youri van Koppenrequested to merge
issue/filefield_paths-3192110:3192110-fix-more-coding into 8.x-1.x

Merge request reports