3347117: Fix more phpcs and include #5 comments as well

Kunal Gautamrequested to merge
issue/shortcut_menu-3347117:coding-standard-3347117 into 3.x

Fix more phpcs and include #5 comments as well

Merge request reports