Merge branch 'fix/return-type-in-function-outsideScvfWithSameIntegrationPoint' into 'master'

[fix] conditional return type in function outsideScvfWithSameIntegrationPoint

Closes #1159

See merge request !3135

(cherry picked from commit ed6128e9)

602e4818 [fix][ff][staggered] Fix return type of outsideScvfWithSameIntegrationPoint
5 jobs for !3141 with cherry-pick-ed6128e9
latest merge request