If manifest improvements from ServiceMix linked in comments to HV-1039 were applied to the main bundle, the 'wrap's would evaporate.