Fix for OPENDJ-1572

These are draft, in-progress.