Revert "SERVER-5470 extended plan cache to hold all solutons from planning process"
SERVER-11658 Fixup two lingering StaticLibrary instances
Merge remote-tracking branch 'upstream/master'