SERVER-10448 fix candidate deletion in multi plan stage
Merge remote-tracking branch 'upstream/master'