Merge branch 'L2SS-1359_refactor_combined_hierarchy_logic' into 'master'

tangostationcontrol/integration_test/default/devices/base.py

...tion_test/default/devices/base_device_classes/__init__.py

...fault/devices/base_device_classes/test_power_hierarchy.py

...tationcontrol/tangostationcontrol/devices/antennafield.py

tangostationcontrol/tangostationcontrol/devices/aps.py

tangostationcontrol/tangostationcontrol/devices/apsct.py

tangostationcontrol/tangostationcontrol/devices/apspu.py

...ngostationcontrol/devices/base_device_classes/__init__.py

...tationcontrol/devices/base_device_classes/async_device.py

...stationcontrol/devices/base_device_classes/beam_device.py

...ioncontrol/devices/base_device_classes/clock_hierarchy.py

...ncontrol/devices/base_device_classes/control_hierarchy.py

...gostationcontrol/devices/base_device_classes/hierarchy.py

...oncontrol/devices/base_device_classes/hierarchy_device.py

...tationcontrol/devices/base_device_classes/lofar_device.py

...tationcontrol/devices/base_device_classes/opcua_device.py

...ioncontrol/devices/base_device_classes/power_hierarchy.py

...stationcontrol/devices/base_device_classes/recv_device.py

...stationcontrol/devices/base_device_classes/snmp_device.py

tangostationcontrol/tangostationcontrol/devices/boot.py