SERVER-15886 SubplanStage tries to plan each branch from the cache

Fixes a bug in which the SubplanStage could put a bad plan into the plan cache.
SERVER-16137 correct comment
Merge remote-tracking branch 'upstream/master'