Re-commit r214547 with tests fixed. Hopefully all the bots will be happy now.

Original message:

Fix iterator invalidation issues that are breaking my modules buildbot's
bootstrap.

llvm-svn: 214555