Merge pull request #3404 from github/henrymercer/include-oids-in-bundle #2404

Job	Run time
Upload debug artifacts (linked)	6m 55s
Upload debug artifacts (default)	6m 37s
Upload debug artifacts (stable-v2.20.3)	5m 40s
Upload debug artifacts (nightly-latest)	6m 38s
Download and check debug artifacts	9s
	25m 59s

Provide feedback