tvheadend: master

Signed-off-by: dh-harald <github@criminal.hu>
oscam: 9865

Signed-off-by: dh-harald <github@criminal.hu>
tvheadend: fix patches

Signed-off-by: dh-harald <github@criminal.hu>