Merge "Make default permission checks in performance service more restrictive." into oc-dr1-dev