SIO-1517 Sometimes package reupload creates second ProblemInstance

Change-Id: I3669cb014b86e99da07e72a25e247f1e5efb4351
Merge "SIO-1517 Sometimes package reupload creates second ProblemInstance"