Issue #2623680 by alexpott, pfrenssen: Fix phpcs.xml.dist to work with the latest rules and not have unnecessary lines (cherry picked from commit 8b1db195)