bug 1017923 - more gecko_migration.py fixes for merge day. r=rail