Remove use of deprecated factories
See merge requests !992 (merged), gaudi/Gaudi!420 (merged) (mostly cherry picked from commit c51c0682)
See LHCBPS-1830
See merge requests !992 (merged), gaudi/Gaudi!420 (merged) (mostly cherry picked from commit c51c0682)
See LHCBPS-1830