WIP: [BUG-33]  Replace CL_DEBUG_XXX with  CL_LOG_SEV_XXX