Backport all non-master-specific changes from master
- A few commits that went through the SVN mirroring: 1ee7a165, ad3b5b92, 6d4f657c
- The list of included MRs is !12 (merged), !23 (merged), !24 (merged), !26 (merged), !34 (merged), !39 (merged), !41 (merged), !42 (merged), !46 (merged), !47 (merged), !49 (merged), !50 (merged), !53 (merged), !57 (merged), !58 (merged), !63 (merged), !65 (merged), !66 (merged), !67 (merged), !68 (merged), !69 (merged), !72 (merged), !73 (merged), !74 (merged).
- See LHCBPS-1685