CPUInfo: additional cleanup for CPU string
Merge pull request #3673 from Karlson2k/fix_cpu_name_01

CPUInfo: additional cleanup for CPU string
fixes PVR channel icon scan
[subtitles core] set correct icon
Fixed: indentations
Merge remote-tracking branch 'remotes/upstream/master'