Use remove-dt-dl-dd branches

If no barceloneta branch is present.

As @davisagli said (https://github.com/plone/buildout.coredev/commit/52a3c592f25894b28d691802d8fcfe13064c7f11#commitcomment-5351763), let's wait with the merge until tests are green.