AME-4028 CR-4168 The service management layer has been refactored to support independent timeouts depending on the type of connection required.