Merge branches/temp-admin@3208 onto trunk@3208.

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/tests/functional-tests/shared/data/privileges/privileges_startup.ldif

@@ -27,7 +27,7 @@
objectClass: person
objectClass: organizationalPerson
objectClass: inetOrgPerson
objectClass: ds-cfg-root-dn
objectClass: ds-cfg-root-dn-user
objectClass: top
ds-cfg-alternate-bind-dn: cn=Aroot
givenName: Aroot