Fixes to the samba migration to prevent a reprovision
Merge branch 'cperello/samba-migration-fixes'