s4-dsdb: Handle rename conflicts in both directions