Merge "Fix PhpStorm IDE warnings in ServiceWiring.php"