[Code Style] Fixing phpcs errors from recent commits
[Code Style] Missed one.
[Code Style] Another indention issue
Merge branch 'staging' into 3.4-dev