Merge branch 'master' into vharseko-patch-1

Valery Kharseko

19 hours ago d7c2353c5f18cd9445217fc2e8c08fdd25824e65

 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/RootContainer.java

@@ -336,7 +336,7 @@
  {
    if (monitor == null)
    {
      monitor = new BackendMonitor(backendId + " Storage", this);
      monitor = new BackendMonitor(DN.escapeAttributeValue(backendId) + " Storage", this);
    }
    return monitor;
  }