Fixes to the samba migration to prevent a reprovision