Conflicts: GaudiKernel/cmt/requirements GaudiKernel/src/Lib/Property.cpp GaudiKernel/src/Util/genconf.cpp