Fix tests due to "entry already exists" error for the base domain

Fixes 'entry already exists' failures when booting ApacheDS for running tests.

We are all of these commented out instead of removed?