Merge branch 'dev/atlas-merge'

* dev/atlas-merge: (31 commits)
  updated reference files
  minor change in GaudiTest for a change in a debug message
  removed duplicated printout
  Merged ATLAS tags.
  ScheduledStop should not result in a termination error message
  inheritance of JobHistory on IVersHistoryObj made 'virtual public'
  updated reference files for History and THistSvc tests
  removed last NDEBUG from HistorySvc.cpp
  restored presetting of Services outputLevel from MessageSvc
  added FileMgr to CMake configuration
  fixed compilation with C++11 after the changes to THistSvc.cpp
  fix unchecked statuscode
  added GaudiMonitor to list of extra modules
  patches for CMT v1r26
  import modules from GaudiCoreSvc and GaudiCommonSvc into GaudiSvcConf.py for ATLAS tag
  make genconf extra mods tag dependent
  genconf: import user defined modules
  allow genconf to import user modules with new pattern
  fix usage of default svc priority
  set def svc priority to const int
  ...

Conflicts:
	Gaudi/doc/release.notes
	GaudiCommonSvc/doc/release.notes
	GaudiCoreSvc/doc/release.notes
	GaudiExamples/doc/release.notes
	GaudiExamples/tests/qmtest/refs/Aida2Root.ref
	GaudiExamples/tests/qmtest/refs/EvtColsEx/Write.ref
	GaudiExamples/tests/qmtest/refs/Histograms.ref
	GaudiExamples/tests/qmtest/refs/ROOT_IO/ExtCollWrite.ref
	GaudiKernel/doc/release.notes
	GaudiMP/doc/release.notes
	GaudiPolicy/doc/release.notes
	GaudiSvc/doc/release.notes
	GaudiSys/doc/release.notes

From: Marco Clemencic <marco.clemencic@cern.ch>


git-svn-id: http://svnweb.cern.ch/guest/gaudi/Gaudi/trunk/GaudiCoreSvc@7354 53ecefc3-a64d-0410-9bdf-b8581fa3287e
updated versions in requirements and CMakeLists.txt

From: Marco Clemencic <marco.clemencic@cern.ch>


git-svn-id: http://svnweb.cern.ch/guest/gaudi/Gaudi/trunk/GaudiCoreSvc@7355 53ecefc3-a64d-0410-9bdf-b8581fa3287e
Preparing to tag Gaudi v24r1

v24r0 existed only in the special ATLAS branch.

From: Marco Clemencic <marco.clemencic@cern.ch>


git-svn-id: http://svnweb.cern.ch/guest/gaudi/Gaudi/trunk/GaudiCoreSvc@7356 53ecefc3-a64d-0410-9bdf-b8581fa3287e