PHPCS for includes and administrator/includes
Merge pull request #2085 from wilsonge/hotfix/phpcs

PHPCS for includes and administrator/includes