Merge branch '3.3.x'
Merge pull request #6814 from iMattPro/ticket/17510 [ticket/17510] Fix Code Sniffer deprecations