Merge branches/temp-admin@3208 onto trunk@3208.

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java

@@ -128,7 +128,7 @@
        .getRootConnection();
    mods.add(new Modification(ModificationType.REPLACE,
        new org.opends.server.types.Attribute(
            "ds-cfg-connection-handler-enabled", "true")));
            "ds-cfg-enabled", "true")));
    ModifyOperationBasis op = new ModifyOperationBasis(
        conn,
        conn.nextOperationID(),