loosely related changes
tevent hack no longer required
came up with a solution for samba configs
Merge remote-tracking branch 'origin/master'