SERVER-14069 take out killCurrentOp in journal recovery
SERVER-14062 migrate more curop via OpCtx
Merge remote-tracking branch 'upstream/master'