SERVER-15369: Clean up partially created .ns files
SERVER-15437 wait for replication before proceeding
Merge remote-tracking branch 'upstream/master'