Merge remote-tracking branch 'upstream/master' into wip-7999-master

Conflicts:
	src/os/KeyValueStore.h

diff --cc src/os/FileStore.cc
Simple merge

diff --cc src/os/FileStore.h
Simple merge

diff --cc src/os/KeyValueStore.cc
Simple merge

diff --cc src/os/KeyValueStore.h
index 402b4cba92b656729336740b180d6ff299276647,59e01a9c4a1a32920247d48b2ab77fb08fb030c1..5f62c5a0bfa5690539a3f0a087e013f4d3ecadf0
--- 1/src/os/KeyValueStore.h
--- 2/src/os/KeyValueStore.h
+++ b/src/os/KeyValueStore.h
@@@ -257,9 -266,8 +266,9 @@@ class KeyValueStore : public ObjectStor
    class OpSequencer : public Sequencer_impl {
      Mutex qlock; // to protect q, for benefit of flush (peek/dequeue also protected by lock)
      list<Op*> q;
-     list<uint64_t> jq;
      Cond cond;
 +    list<pair<uint64_t, Context*> > flush_commit_waiters;
+     uint64_t op; // used by flush() to know the sequence of op
     public:
      Sequencer *parent;
      Mutex apply_lock;  // for apply mutual exclusion

diff --cc src/os/ObjectStore.h
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge