Merge admin framework from config-prototype-branch onto trunk.

matthew_swift

23.26.2007 2861a1aad527dae9aea800386d58fc7416233ae5

 opendj-sdk/opends/src/server/org/opends/server/monitors/ConnectionHandlerMonitor.java

@@ -73,7 +73,7 @@
  private AttributeType protocolType;

  // The connection handler with which this monitor is associated.
  private ConnectionHandler connectionHandler;
  private ConnectionHandler<?> connectionHandler;

  // The name for this monitor.
  private String monitorName;