Merge remote-tracking branch 'upstream/wip_recovery_reserve'

Reviewed-by: Samuel Just <sam.just@inktank.com>

diff --cc src/Makefile.am
Simple merge

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

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

diff --cc src/osd/PG.h
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