SERVER-10026 git rid of $and match expressions with a single child

Signed-off-by: Matt Kangas <matt.kangas@mongodb.com>