Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-gmake3