Merge branch 'master' into wip-remove-unused-class-declaration

diff --cc src/osd/OSD.h
index 283161cccdba327b345a92aa44117d42a3f8f760,3c8fac9788b4175b176987e966cdea137f6c2429..c1850ee813f1a29672df54c7e4dae8716c27b74e
--- 1/src/osd/OSD.h
--- 2/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@@ -212,7 -214,8 +213,7 @@@ class MOSDPGMissing
  class Objecter;
  
  class Watch;
- class ReplicatedPG;
 -class Notification;
+ class PrimaryLogPG;
  
  class AuthAuthorizeHandlerRegistry;