More PHPCS fixes from content versioning
Merge pull request #1903 from wilsonge/phpcs2

More PHPCS fixes from content versioning