LIB: Don't treat UDP and TCP as separate exception lists

Ticket #597
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration
QUASAR: Fix something that got broken in the merge commit 8a1a53ee8ce