Merge "Fix CodeSniffer errors and warnings in includes/specials (2)"