SERVER-14073 allow planSummary string to be longer
Merge remote-tracking branch 'upstream/master'