Stage partial fix for OPENDJ-1501
Stage partial fix for OPENDJ-1501