Merge branch 'master' into hive

Conflicts:
	GaudiAlg/GaudiAlg/GaudiCommon.h
	GaudiAlg/src/lib/GaudiCommon.icpp
	GaudiAlg/src/lib/GaudiSequencer.cpp
	GaudiCommonSvc/src/AlgContextSvc.cpp
	GaudiCommonSvc/src/DataSvc/MultiStoreSvc.cpp
	GaudiExamples/tests/qmtest/refs/ColorMsg.ref
	GaudiExamples/tests/qmtest/refs/History.ref
	GaudiExamples/tests/qmtest/refs/ROOT_IO/Write.ref
	GaudiExamples/tests/qmtest/refs/RandomNumber.ref
	GaudiExamples/tests/qmtest/refs/conditional_output/write.ref
	GaudiKernel/GaudiKernel/AlgTool.h
	GaudiKernel/GaudiKernel/IAlgTool.h
	GaudiKernel/python/GaudiKernel/Configurable.py
	GaudiKernel/scripts/gaudiComponentHelp.py
	GaudiKernel/src/Lib/AlgTool.cpp
	GaudiKernel/src/Lib/DataSvc.cpp
	GaudiKernel/src/Lib/Service.cpp
	GaudiPolicy/doc/release.notes
	GaudiSvc/tests/qmtest/refs/Test.ref