SERVER-12392: actually delete cursor from killCursor
SERVER-12392: put old cursor metrics back as haven't deprecated before
Merge remote-tracking branch 'upstream/master'