Merge pull request #9452 from mslovy/wip-preserve-alloc-hint

osd:preserve allocation hint attribute during recovery

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc src/os/ObjectStore.h
Simple merge

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

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

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

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