Merge branch 'Integration_Rel17_SA5_150_YAML' into...

Merge branch 'Integration_Rel17_SA5_150_YAML' into 'TS28.312_Rel17_CR0094_Correct_issues_for_Service_Support_Expectation'

# Conflicts:
#   OpenAPI/TS28312_IntentExpectations.yaml