Merge branch 'staging' into...

Merge branch 'staging' into 'OCF96-patch-or-update-on-publish-must-sent-only-service_api_update-if-aefs-status-not-change'

# Conflicts:
#   services/TS29222_CAPIF_Publish_Service_API/published_apis/core/serviceapidescriptions.py