Merge branch 'OCF85-fixes-in-vendor-specific-functionalities' into 'staging'

...ervice_API/service_apis/controllers/default_controller.py

..._Discover_Service_API/service_apis/core/discoveredapis.py

...scover_Service_API/service_apis/models/discovered_apis.py

...APIF_Discover_Service_API/service_apis/vendor_specific.py

...vice_API/published_apis/controllers/default_controller.py

...Service_API/published_apis/core/serviceapidescriptions.py

...vice_API/published_apis/models/service_api_description.py

...PIF_Publish_Service_API/published_apis/vendor_specific.py