Redmine#5315: use new convenience bundles, replacing some dcs bundles