Merge branch 'v4-0-test' of git://git.samba.org/samba into v4-0-local