Merge "Pass phpcs-strict on mw-config/"