SERVER-9484 don't ignore geometries w/>1 covers if one of them isn't in the search annulus

Conflicts:

	src/mongo/db/geo/s2nearcursor.cpp