Fix reverting resolvconf configuration after domain join
Merge branch 'scabrero/samba-revert-dns-after-join' into 3.3

Conflicts:
	main/samba/ChangeLog