merge stable changes

diff --cc cam.c
Simple merge

diff --cc sc.c
Simple merge

diff --cc smartcard.c
Simple merge

diff --cc systems/viaccess/tps.c
Simple merge

diff --cc systems/viaccess/viaccess.c
Simple merge

diff --cc testing/compat.c
Simple merge