mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
Merge remote-tracking branch 'origin/master' into vharseko-master