Merge branch 'jewel' into wip-jewel-snaptrim

diff --cc PendingReleaseNotes
index cca45304244f6f2aef7a51ba2464c5f4868c22c3,b8eb638408631538afb209bdb89b49ae355e4d74..96369f718ff5bc5f763cbaa1771613716b0befe6
--- 1/PendingReleaseNotes
--- 2/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@@ -5,9 -18,10 +18,17 @@@
    is enabled (it's off by default).  This means that a VM using librbd that
    previously would have gotten an EIO and gone read-only will now see a
    blocked/hung IO instead.
-   of trim operations to the underlying system.
+ 
+ * Calculation of recovery priorities has been updated.
+   This could lead to unintuitive recovery prioritization
+   during cluster upgrade. In case of such recovery, OSDs
+   in old version would operate on different priority ranges
+   than new ones. Once upgraded, cluster will operate on
+   consistent values.
++
 +* This release greatly improves control and throttling of the snap trimmer. It
 +  introduces the "osd max trimming pgs" option (defaulting to 2), which limits
 +  how many PGs on an OSD can be trimming snapshots at a time. And it restores
 +  the safe use of the "osd snap trim sleep" option, wihch defaults to 0 but
 +  otherwise adds the given number of seconds in delay between every dispatch
++  of trim operations to the underlying system.

diff --cc src/common/config_opts.h
Simple merge

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

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

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

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

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