PHPCS cleanup for admin modules
Merge pull request #1698 from wilsonge/phpcsadminmodules

PHPCS cleanup for admin modules