SERVER-12868 added memory usage accounting to hashed AND stage
SERVER-12868 added getMemUsage to WorkingSetMember
SERVER-12868 renamed QuerySolution::hasSortStage to more generic hasBlockingStage
SERVER-12868 Pick backup plan when winning plan contains hashed AND stage
SERVER-12885 Make sure mongodump can dump admin.system.users when explicitly asked to
SERVER-12921 Make sure mongorestore runs cleanup routines on error
Merge remote-tracking branch 'upstream/master'