Apply the -runbundles+ decorator on the computed RunBundles when resolving

Apply the -runbundles+ decorator on the computed RunBundles when resolving #4621