merged develop and fixed conflicts

Author: flinden68

product/src/main/kotlin/nl/nlportal/product/service/ProductService.kt

@@ -461,4 +461,4 @@ class ProductService(
 
         val logger = KotlinLogging.logger {}
     }
-}
+}

zgw/common-ground-authentication/src/main/kotlin/nl/nlportal/commonground/authentication/AuthenticationMachtigingsDienstService.kt

@@ -16,8 +16,8 @@
 package nl.nlportal.commonground.authentication
 
 import com.fasterxml.jackson.core.type.TypeReference
-import mu.KLogger
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogger
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.core.util.Mapper
 import org.springframework.core.io.ResourceLoader
 import java.util.UUID

zgw/openklant/src/main/kotlin/nl/nlportal/openklant/service/OpenKlant2Service.kt

@@ -15,7 +15,7 @@
  */
 package nl.nlportal.openklant.service
 
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import nl.nlportal.commonground.authentication.CommonGroundAuthentication
 import nl.nlportal.openklant.client.OpenKlant2KlantinteractiesClient
 import nl.nlportal.openklant.client.domain.OpenKlant2DigitaleAdres