phpcs automated code fixups 2017-11-23

[phil-davis]

Q	A
Bug fix?	Y
New feature?
Automated tests included?
Related user documentation PR URL
Related developer documentation PR URL
Issues addressed (#s or URLs)
BC breaks?
Deprecations?

Description:

Make code format etc changes as suggested by phpcs

Steps to reproduce the bug:

1. Run Travis CI
2. It fails the phpcs checks

Steps to test this PR:

1. Run Travis CI
2. It passes phpcs checks

List deprecations along with the new alternative:

List backwards compatibility breaks:

[phil-davis]

Followup of #5243 - later code changes in staging have bits and pieces that fail phpcs checks.
Fix these so that phpcs checks pass in CI.

[phil-davis]

Pinging those who reviewed on #5243
@alanhartless @Maxell92 @dongilbert @escopecz
You might like to review and quickly merge this, so that CI in staging will pass again for everybody.

[phil-davis]

I rebased and discovered that someone else has done these changes also and merged to staging.