Now we've got PHPCS switched on, kill long lines

Lest PHPCS throws wobblies over unrelated changes in PHP files with
underlying issues in their code style.

Change-Id: Ifc4aec328d726e9ca62db34af55ea9592c08d9f3
Merge "Now we've got PHPCS switched on, kill long lines"