L2SS-287: Correct a pretty horrific rebase

docker-compose/itango/lofar-requirements.txt

docker-compose/lofar-device-base/lofar-requirements.txt

...tationcontrol/tangostationcontrol/common/lofar_logging.py

...ationcontrol/tangostationcontrol/devices/docker_device.py

...ioncontrol/tangostationcontrol/devices/hardware_device.py

tangostationcontrol/tangostationcontrol/devices/recv.py

tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py

tangostationcontrol/tangostationcontrol/devices/sdp/sst.py

...tioncontrol/tangostationcontrol/devices/sdp/statistics.py

...l/tangostationcontrol/devices/sdp/statistics_collector.py

tangostationcontrol/tangostationcontrol/devices/sdp/xst.py

tangostationcontrol/tangostationcontrol/devices/unb2.py

...ationcontrol/tangostationcontrol/integration_test/base.py

...trol/tangostationcontrol/statistics_writer/hdf5_writer.py

...angostationcontrol/statistics_writer/statistics_writer.py

...ngostationcontrol/statistics_writer/test/hdf5_explorer.py

tangostationcontrol/tangostationcontrol/test/base.py

...ostationcontrol/test/devices/test_statistics_collector.py

...tioncontrol/tangostationcontrol/toolkit/lts_cold_start.py

tangostationcontrol/tangostationcontrol/toolkit/startup.py