SERVER-16495 Map Reduce Output to Collection Occasionally Kills the Server
SERVER-16556 CurOp::reset() needs to clear _ns

Fixes regression introduced in de724781.
Revert "SERVER-16431 Simplify DB profile code"

This reverts commit c5ebc6be8e3a865655acbc5ecd1cb3b96fdf44ff.
SERVER-16313 whitelist of storage options for WiredTiger
SERVER-16516 remove rbid from isMaster, but leave it in serverStatus
Merge remote-tracking branch 'upstream/master'