r26389: Merge SWAT changes from alpha2 back into main Samba4 tree.