[ALL] Revert Samba 3.6 upgrade