SERVER-10026 SERVER-10471 planner bug fixes from going through tests