Merge remote branch 'origin/classdist'

diff --cc src/Makefile.am
index aaced27c3cb1fabec00892c0884d91df057f59d6,ac94f2d33d0fabd777c846d1922f613f7073beb5..4c094c3de9eaa0aaabd78702ee91e20f8003f322
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -759,11 -755,8 +756,9 @@@ noinst_HEADERS = 
        common/hex.h\
        common/entity_name.h\
        common/errno.h\
 +      common/environment.h\
        common/likely.h\
        common/lockdep.h\
-         common/ClassHandler.h\
-         common/ClassVersion.h\
          common/Clock.h\
          common/Cond.h\
          common/ConfUtils.h\

diff --cc src/common/config.cc
Simple merge

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

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

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