Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet