SOA Track fix (follow up !2356)
Fix conflicts with master. Related to !2356 (merged). Run concurrent to Phys!925 (closed) and LHCb!3011 (closed).
Fix conflicts with master. Related to !2356 (merged). Run concurrent to Phys!925 (closed) and LHCb!3011 (closed).