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
FreeBSD 2/X Fix path for dtv-scan-tables
Merge remote-tracking branch 'upstream/master' into freebsd

* upstream/master:
  mpegts service: Add documentation for Lock Pref. CA PID
  cwc: little log fix (auto-reconnect)...
  mpegts dvb service: add CA PID filter (lock) mode 2 to force CA PID
  service: fix some compiler warnings
  cwc/mpegts dvb service: prevent auto-changes for prefcaid (see issue #2075)
  cwc: change the multiple CA PID handling
Merge remote-tracking branch 'upstream/master' into freebsd

* upstream/master:
  service: add PMT# for noname services and include full service name in service lists
  service: esfilter - set CA use flag also for skipped types
  service: esfilter - set use flag when no filters are applied
  service: show also network name in the service nicename
  esfilter: add logical stream index, enhance the CA type filtering
Put back project headers. From before to after the global includes.
Merge pull request #438 from dreamcat4/freebsd

Fix FreeBSD compiler errors.