SERVER-10026 returnKey in new system
SERVER-10026 remove query spigot and old find impl