SERVER-13579 Wait for deletion after migration in feature2.js
(cherry picked from commit b3aaf2e5809e272367b0f60f66938d8bf712702c)
SERVER-13577 geo_borders.js immediately catches own assertions
(cherry picked from commit 4ded21c8fa77bce8f2edb4f7d1a360d83c6052fc)