Merge pull request #8035 from liewegas/wip-bluestore

osd: bluestore updates, scrub fixes

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc src/include/buffer.h
Simple merge

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

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

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

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

diff --cc src/test/bufferlist.cc
Simple merge