Merge branch 'hotfix/#6487-trailing-spaces-removal-hotfix' into develop

Forward port #6487
Updated php-cs-fixer to skip files that intentionally has trailing spaces
Merge remote-tracking branch 'upstream/develop' into develop