Several merge conflicts were manually fixed.
LArCalorimeter/LArOnlDbPrep/share/LArDSPThresholdFillAlg.py
LArCalorimeter/LArCondUtils/share/LArHVPathologyDbWrite.py
LArCalorimeter/LArCondUtils/share/LArHVPathologyDbRead.py
PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet/python/InDetToolsConfig.py
PhysicsAnalysis/DerivationFramework/DerivationFrameworkConfiguration/python/DerivationConfigList.py