Update for OPENDJ-1572