Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)

src/driver/streamts.cpp

@@ -564,10 +564,7 @@ void CStreamManager::run()
 	int poll_timeout = -1;
 
 	printf("Starting STREAM thread keeper, tid %ld\n", syscall(__NR_gettid));
-/* merge conflict */
-#if 0
 	set_threadname("n:streammanager");
-#endif
 
 	while (running) {
 		mutex.lock();