mpegts tables: fix the deferred tables locking mechanism
mpegts table destroy: move the data free calls to the release routine
mpegts tables: fix another table list inconsistency
SAT>IP: set the teardown timeout to 500ms
subscription: Add watchdog for the data reception

.. for sevices and add the timeout timer for the mux subscriptions
capmt: do not cache keys for the descrambler layer
descrambler: add other odd/even key validity check based on the key update time
service_mapper: remove include "plumbing/tsfix.h"
capmt: a slight optimization - remove the key data
SAT>IP: finish the RTSP command to keep connection consistent
SAT>IP: finish the RTSP OPTIONS command to keep connection consistent
epggrab: ota - requeue skipped muxes (network check)

- enhance trace
- do not print delete problem? messages on shutdown
epggrab: ota - optimize the eit/opentv workflow

Assume that the EPG grab is completed when:

- no EIT data are present and opentv completed
- EIT data are present but opentv data were not seen
epggrab: ota - improve save caching and add no data timeout

- fix the complete flag load
- improve the save request caching
- mark as completed all timeout states (no data, EPG timeout)
webui: Stream directly for TVHeadend/ http client, too
webui: remove dead code (tvhlog_level)
webui: enable file logging when the log file is set through GUI
FreeBSD 1/X - Fix compiler errors
Merge remote-tracking branch 'upstream/master' into freebsd

* upstream/master:
  webui: enable file logging when the log file is set through GUI
  webui: remove dead code (tvhlog_level)
  webui: Stream directly for TVHeadend/ http client, too
  epggrab: ota - improve save caching and add no data timeout
  epggrab: ota - optimize the eit/opentv workflow
  epggrab: ota - requeue skipped muxes (network check)
  SAT>IP: finish the RTSP OPTIONS command to keep connection consistent
  SAT>IP: finish the RTSP command to keep connection consistent
  capmt: a slight optimization - remove the key data
  service_mapper: remove include "plumbing/tsfix.h"
  descrambler: add other odd/even key validity check based on the key update time
  capmt: do not cache keys for the descrambler layer
cwc: change the multiple CA PID handling