ldapadmin - Fixing rebase glitches, rebasing onto master