Merge branch 'wip-bluestore-per-pool-compress2' of https://github.com/ifed01/ceph

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

diff --cc src/os/bluestore/BlueStore.cc
Simple merge

diff --cc src/os/bluestore/BlueStore.h
Simple merge

diff --cc src/os/bluestore/bluestore_types.h
Simple merge

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

diff --cc src/test/objectstore/store_test.cc
Simple merge

diff --cc src/test/objectstore/test_bluestore_types.cc
Simple merge