Merge branch 'master' into L2SS-404-archiving-setup-development

...ncontrol/tangostationcontrol/clients/statistics_client.py

tangostationcontrol/tangostationcontrol/devices/apsct.py

tangostationcontrol/tangostationcontrol/devices/apspu.py

tangostationcontrol/tangostationcontrol/devices/beam.py

...tationcontrol/tangostationcontrol/devices/lofar_device.py

tangostationcontrol/tangostationcontrol/devices/recv.py

tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py

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

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

tangostationcontrol/tangostationcontrol/devices/sdp/xst.py

...gostationcontrol/integration_test/default/devices/base.py

...trol/integration_test/default/devices/test_device_beam.py

...ntrol/integration_test/default/devices/test_device_sdp.py

...ntrol/integration_test/default/devices/test_device_sst.py

...ntrol/integration_test/default/devices/test_device_xst.py