Merge branch 'staging' into OCF38-logging-ccf-use-redis-to-send-event-service-api-invocation