Pass phpcs-strict on mw-config/

Change-Id: I80e5c26f4d11cfb9b702382859587438406e729c
Pass phpcs-strict on maintenance/ (8/8)

Woo!

Change-Id: I6c591492db363dfab81e5ddfa4a03213347ff5cb
Merge "Pass phpcs-strict on maintenance/ (8/8)"
Merge "Pass phpcs-strict on mw-config/"