Merge branch 'master' into vharseko-patch-1

Valery Kharseko

2 days ago d7c2353c5f18cd9445217fc2e8c08fdd25824e65

 opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java

@@ -44,6 +44,7 @@
import java.util.Set;
import java.util.concurrent.TimeUnit;

import org.forgerock.opendj.ldap.DN;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigChangeResult;
@@ -1212,7 +1213,7 @@

      db.initialize();
      volume = db.loadVolume(VOLUME_NAME);
      monitor = new PDBMonitor(config.getBackendId() + " PDB Database", db);
      monitor = new PDBMonitor(DN.escapeAttributeValue(config.getBackendId()) + " PDB Database", db);
      DirectoryServer.registerMonitorProvider(monitor);
    }
    catch(final InUseException e) {