Merge commit 'origin/master' into libcli-auth-merge-without-netlogond

diff --cc source3/include/proto.h
Simple merge

diff --cc source3/libnet/libnet_join.c
Simple merge

diff --cc source3/libsmb/cliconnect.c
Simple merge

diff --cc source3/rpc_server/srv_samr_nt.c
Simple merge

diff --cc source3/utils/net_rpc.c
Simple merge

diff --cc source3/utils/net_rpc_join.c
Simple merge

diff --cc source4/torture/rpc/samr.c
Simple merge