SERVER-13579 Wait for deletion after migration in feature2.js
Merge remote-tracking branch 'upstream/master'