Backport some files to pbi container creation for releng/10.0