Please merge upstream

In particular, https://github.com/mongodb/mongo/commit/2b7b105b3c26bc779d30d3c7ec4b93a0115569a8 fixes a locking issue that affects at least one replication jstest for WT.