Fix failing tests and cleanup

Jean-Noël Rouvignac

22.29.2016 2250643bd27e47583d10cb33964693c6b44450d9

 opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaConstants.java

@@ -1894,8 +1894,7 @@
  /**
   * The OID for the user password attribute syntax.
   */
  public static final String SYNTAX_USER_PASSWORD_OID =
       OID_OPENDS_SERVER_ATTRIBUTE_SYNTAX_BASE + ".1";
  public static final String SYNTAX_USER_PASSWORD_OID = "1.3.6.1.4.1.1466.115.121.1.40";