Merge branch 'OCF204-same-apiname-between-different-apis-must-be-allowed' into 'staging'
Ocf204 same apiname between different apis must be allowed See merge request !184
Ocf204 same apiname between different apis must be allowed See merge request !184