Merge pull request #491 from kri5/wip-clang-compilation

Fix compilation -Wmismatched-tags warnings

Reviewed-by: Loic Dachary <loic@dachary.org>

diff --cc src/mon/Monitor.h
Simple merge

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

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

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

diff --cc src/rgw/rgw_common.h
Simple merge