Merge branch 'dev4_20210907' into 'master'

CxxUtils, TrigConfBase: add missing includes visible in dev4 builds

See merge request atlas/athena!46336

Control/CxxUtils/Root/StringUtils.cxx

@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include <iostream>
+#include <cmath>
 
 namespace CxxUtils {
 

Trigger/TrigConfiguration/TrigConfBase/src/TrigDBConnectionConfig.cxx

@@ -13,6 +13,7 @@
 #include <stdexcept>
 #include <boost/regex.hpp>
 #include <boost/algorithm/string.hpp>
+#include <sstream>
 
 using PSKeys = TrigConf::TrigDBConnectionConfig::PSKeys;
 using namespace boost;