OPENDJ-3089 Several minor fixes from the PR

Nicolas Capponi

23.02.2016 ec6fcea7eb3b1013db8b26ff65327d3ab24077c9

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java

@@ -34,7 +34,6 @@
import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.requests.SearchRequest;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
import org.forgerock.opendj.ldap.schema.MatchingRuleImpl;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.opends.admin.ads.util.ConnectionWrapper;
@@ -96,20 +95,6 @@

  }

  private void addMatchingRuleIfMissing(SchemaBuilder schemaBuilder, Schema baseSchema, final String oid,
      final String name, final String syntaxOID, final MatchingRuleImpl impl) throws InitializationException,
      ConfigException, DirectoryException
  {
    if (!baseSchema.hasMatchingRule(name))
    {
      schemaBuilder.buildMatchingRule(oid)
        .names(name)
        .syntaxOID(syntaxOID)
        .implementation(impl)
        .addToSchema();
    }
  }

  private void removeNonOpenDjOrOpenDsSyntaxes(final SearchResultEntry entry) throws DirectoryException
  {
    Attribute attribute = entry.getAttribute(AttributeDescription.create(getLDAPSyntaxesAttributeType()));