Merge branch 'master' into gsc18ai32

src/daqd/CMakeLists.txt

src/daqd/comm.y

src/daqd/comm_impl.cc

src/daqd/comm_impl.hh

src/daqd/daqd.cc

src/daqd/daqd.hh

src/daqd/net_writer.cc

src/daqd/net_writer.hh

src/daqd/network_helpers.cc

src/daqd/network_helpers.hh

src/daqd/tests/test_daqd_live_nds.sh.in

src/daqd/tests/test_network_helpers.cc

src/daqd/util/checkdaqconfig.py

src/daqd/util/checkdaqconfig_test.py

src/fe/controllerIop.c

src/fe_stream_test/fe_stream_check_nds.cc