Merge PR #22615 into master

* refs/pull/22615/head:
	common: fix enum redeclaration

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/librbd/ImageCtx.cc
Simple merge

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

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

diff --cc src/osdc/ObjectCacher.cc
Simple merge