Merge branch 'next'

Conflicts:
	src/osd/ReplicatedPG.cc

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

diff --cc src/osd/ReplicatedPG.cc
index 83502de7d1248580b41759fa94cb3e02ff84a038,becba7afab0e7acfd5aa2a9a8a090a7db8f97bb3..37f34fcb79e83905c2cc4bcb3168b7a7d9b598c2
--- 1/src/osd/ReplicatedPG.cc
--- 2/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@@ -6039,7 -6246,11 +6039,11 @@@ void ReplicatedPG::on_removal(
  {
    dout(10) << "on_removal" << dendl;
    apply_and_flush_repops(false);
 -  remove_watchers_and_notifies();
 +  context_registry_on_change();
+ 
+   clear_primary_state();
+   osd->remove_want_pg_temp(info.pgid);
+   cancel_recovery();
  }
  
  void ReplicatedPG::on_shutdown()