Merge remote-tracking branch 'upstream/master' into no_more_FTF_MT

CI/watch_list.py

Calorimeter/CaloRec/python/CaloCellGetter.py

Calorimeter/CaloRec/share/CaloRec_jobOptions.py

Control/AthViews/AthViews/ViewHelper.h

Control/AthenaBaseComps/AthenaBaseComps/AthCnvSvc.h

Control/AthenaBaseComps/src/AthCnvSvc.cxx

Control/AthenaCommon/python/BeamFlags.py

...AthenaMonitoring/AthenaMonitoring/GenericMonitoringTool.h

...naMonitoring/AthenaMonitoring/GenericMonitoringToolTest.h

Control/AthenaMonitoring/AthenaMonitoring/MonitoredScope.h

Control/AthenaMonitoring/share/GenericMon.txt

Control/AthenaMonitoring/src/GenericMonitoringToolTest.cxx

...enaMonitoring/src/components/AthenaMonitoring_entries.cxx

Control/AthenaMonitoring/test/GenericMonFilling_test.cxx

Control/AthenaMonitoring/test/GenericMonParsing_test.cxx

Control/GaudiSequencer/src/AthSequencer.h

Control/IOVSvc/src/CondInputLoader.cxx

Control/IOVSvc/src/IOVSvc.cxx

Control/SGComps/src/SGInputLoader.h

Control/SGTools/SGTools/DataBucket.h