Merge remote-tracking branch 'origin/dev' into feature/901-change-functionality-acl-rules

# Conflicts:
#	src/primaite/acl/access_control_list.py

src/primaite/common/__init__.py

@@ -1 +1,2 @@
 # Crown Copyright (C) Dstl 2022. DEFCON 703. Shared in confidence.
+"""Objects which are shared between many PrimAITE modules."""

src/primaite/common/protocol.py

@@ -7,10 +7,10 @@ class Protocol(object):
 
     def __init__(self, _name):
         """
-        Init.
+        Initialise a protocol.
 
-        Args:
-            _name: The protocol name
+        :param _name: The name of the protocol
+        :type _name: str
         """
         self.name = _name
         self.load = 0  # bps

src/primaite/common/service.py

@@ -9,7 +9,7 @@ class Service(object):
 
     def __init__(self, name: str, port: str, software_state: SoftwareState):
         """
-        Init.
+        Initialise a service.
 
         :param name: The service name.
         :param port: The service port.