This commit makes the repackager more lenient when it is invoked several times in the same lifecycle. Closes gh-15034