Merge "Discover primary service by UUID for PTS tests (4/4)" into oc-dev