Merge "Use userId and package installer name when committing rollbacks"