CRM-12621 - Migrate tweaks

Misc fixes for CRM_Utils_Migrate* which arose while working on CRM-12621