Merge remote-tracking branch 'origin/stable' into fix-issue-628

    def __init__(self, address, timeout=2):

        self.address = address

        self.timeout = timeout

    def __enter__(self):

        self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

        connected = 1

        t0 = time.time()

        while time.time() - t0 < timeout:

        while time.time() - t0 < self.timeout:

            connected = self.s.connect_ex(self.address)

            if connected == 0:

                break

"""

import customlogging

import ACSLog

import Connection

from Connection import Connection

#Some comments required here. The custom logger mechanism is not working in python. 

#do the way to separate the system logs to the ones do be shown to the user is to use different