Merge branch 'usage_trim_log_fixes' of https://github.com/matt-akamai/ceph into wip...

diff --cc PendingReleaseNotes
Simple merge

diff --cc src/cls/rgw/cls_rgw.cc
Simple merge

diff --cc src/common/options/rgw.yaml.in
Simple merge

diff --cc src/test/cls_rgw/test_cls_rgw.cc
Simple merge