[ENTESB-1874][MR-904] Fix missing bundles in provisioning when using optional imports