Partial fix for DIRSERVER-1728: core-shared
12 files changed