escape backslashes in ESCINFO[]. fixes #13855
[rbp/omxplayer] reverted e08fee30d1c9ca755ddb5c9833a19b8d1cbabff5 the PI firmware handles this now.
[fix] It appears that we were running out of Tls on windows. This changes the addon system so that a single one is created for the Interceptor functionality rather than one per window.
Add better error checking to the Windows ThreadLocal implementation.
Remove some unused includes of ThreadLocal.h
Merge pull request #2009 from jimfcarroll/screensaver-crash-fix

Screensaver crash fix
Merge pull request #2006 from jmarshallnz/escape_slashes

escape backslashes in ESCINFO[]. fixes #13855
Lock/UnLock synchronization
[confluence] change "wide icons" view naming to "wide". Fixes #13485
[confluence] add 'Bluray Disc' flag to be displayed instead of empty space. Fixes #11718
Merge pull request #2013 from stupid-boy/master

[rbp/omx] fixed propper lock/unlock in omclock
Merge pull request #2014 from MartijnKaijser/fix_ticket_13485

[confluence] change "wide icons" view naming to "wide".
Merge pull request #2015 from MartijnKaijser/fix_11718

[confluence] add 'Bluray Disc' flag to be displayed