Merge "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions." into oc-dev