Merge branch 'v4-0-stable'

diff --combined WHATSNEW4.txt
index 65807e87dd809539f4a8bcf36973981cb8bfadce,5ac0b0b39fb26708c2021fddeaa74cedc78ff593..03cd72c518636c4a41f9a76e3a85dc9f164ac6de
--- 1/WHATSNEW4.txt
--- 2/WHATSNEW4.txt
+++ b/WHATSNEW4.txt
@@@ -112,6 -112,9 +112,6 @@@ continued to evolve, but you may partic
  
   A simple script for setting the expiration of a user was added.
  
 - It is now possible to use the system-installed Heimdal using the 
 - experimental --enable-external-heimdal option to configure.
 -
   The LDB library is now completely asynchronous internally.
  
   Various unknowns and correctness issues in the drsblobs and drsuapi RPC 
@@@ -129,6 -132,16 +129,16 @@@
  
   Auxiliary classes in LDAP schema conversion are now collapsed.
  
+  Several tests have been added to the SMB testsuite.
+ 
+  Object GUIDs in DCE/RPC connections are now dealt with properly.
+ 
+  The correctness of the LSA and NETLOGON implementations has been 
+  improved.
+ 
+  Multi Master Replication configuration can now be generated 
+  for OpenLDAP.
+ 
  These are just some of the highlights of the work done in the past few
  months.  More details can be found in our GIT history.