WIP: Backport fixes to build with LCG 95 + gcc8

Backport of the MRs: !938 (merged) !524 (merged) !464 (merged) !1007 (merged) !998 (merged) !1532 (merged) !1027 (merged) !972 (merged) !933 (merged) !1131 (merged) !1416 (merged) !939 (merged) !790 (merged) !1697 (merged) !1714 (merged) !1702 (merged) !1694 (merged) !1638 (merged) !1674 (merged) !1405 (merged) !1632 (merged) !1550 (merged) !1051 (merged) !995 (merged) !155 (merged) !1233 (merged) !1076 (merged) !315 (merged) !627 (merged) !1554 (merged) !1350 (merged) !1664 (merged) !1608 (merged) !1411 (merged) !103 (merged) !158 (merged) !1598 (merged) !1622 (merged) !1596 (merged) !1595 (merged) !1566 (merged) !1563 (merged) !1493 (merged) !1577 (merged) !1546 (merged) !1545 (merged) !1547 (merged) !1462 (merged) !1421 (merged) !1415 (merged) !1401 (merged) !1387 (merged) !1261 (merged) !1260 (merged) !1179 (merged) !1165 (merged) !1166 (merged) !1148 (merged) !1114 (merged) !1107 (merged) !1090 (merged) !1068 (merged) !1067 (merged) !1058 (merged) !1057 (merged) !925 (merged) !1037 (merged) !992 (merged) !505 (merged) !331 (merged) !326 (merged) !449 (merged) !614 (merged) !492 (merged) !480 (merged) !413 (merged) !274 (merged)

It also includes fixes to the problems introduced with conflict resolutions.

The list of MRs is based on hand picked list of MRs needed for either Gaudi or gcc8 compatibility, plus the MRs they were built on.

Requires: Gaudi/master

Includes: !1815 (closed)