Merge branch 'wip-cache-second'

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

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

diff --cc src/mon/OSDMonitor.cc
Simple merge

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

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