INCUS-218 - klockwork
ICCPP-15 - Change the service to use the GenericLogger
ICCPP-15 - Change the service to use the GenericLogger