Merge branch 'v4-0-test' of /home/jelmer/samba34.git/samba4 into v4-0-test