[master] APIM 8631-revert old commit and add null check for security config

[mergify]

This is an automatic copy of pull request #10656 done by Mergify.

---

Issue

https://gravitee.atlassian.net/browse/APIM-8631

Description

Reverted the old commit, added null check for security config and junit

🏗️ Your changes can be tested here and will be available soon:
Console: https://pr.team-apim.gravitee.dev/10656/console
Portal: https://pr.team-apim.gravitee.dev/10656/portal
Management-api: https://pr.team-apim.gravitee.dev/10656/api/management
Gateway v4: https://pr.team-apim.gravitee.dev/10656
Gateway v3: https://pr.gateway-v3.team-apim.gravitee.dev/10656

---

Cherry-pick of 5174d35 has failed:

On branch mergify/bp/master/pr-10656
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 5174d35d70.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/plan/use_case/UpdatePlanUseCaseTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/plan/model/PlanUpdates.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

[mergify]

Cherry-pick of 5174d35 has failed:

On branch mergify/bp/master/pr-10656
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 5174d35d70.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/apim/core/plan/use_case/UpdatePlanUseCaseTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/plan/model/PlanUpdates.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally