Sync with tvheadend/master and merge in changes.

diff --cc configure
Simple merge

diff --cc src/dvb/dvb_tables.c
Simple merge

diff --cc src/htsp_server.c
Simple merge

diff --cc src/webui/extjs.c
Simple merge

diff --cc src/webui/webui.c
Simple merge