Scabrero/samba gpos

To be merged after jag fixes for s4sync