Merge branch 'master' into vharseko-patch-1

Valery Kharseko

2 days ago d7c2353c5f18cd9445217fc2e8c08fdd25824e65

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java

@@ -542,7 +542,7 @@
    // If it takes time to read the entry, the rdnAttribute might not be initialized yet. Don't try to use it then.
    if (value.length() > 0 && rdnAttribute != null)
    {
      dn.setText(rdnAttribute + "=" + value + "," + parentDN.getText().trim());
      dn.setText(getNewEntryDN(rdnAttribute, value, parentDN.getText().trim()));
    }
    else
    {