Fix failing tests and cleanup

Jean-Noël Rouvignac

22.29.2016 2250643bd27e47583d10cb33964693c6b44450d9

 opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java

@@ -81,8 +81,9 @@
  public ServerContextBuilder withConfigurationBootstrapped()
      throws InitializationException
  {
    final ServerManagementContext serverManagementContext =
    final ConfigurationHandler configHandler =
        ConfigurationBootstrapper.bootstrap(serverContext, ConfigurationHandler.class);
    final ServerManagementContext serverManagementContext = new ServerManagementContext(configHandler);
    when(serverContext.getServerManagementContext()).thenReturn(serverManagementContext);
    return this;
  }