migration. Also, fixes an old bug where older migration flags were not being checked for properly. llvm-svn: 185948