Merge "Make CodeSniffer checks pass on includes/specialpages/"