Fixes #3551: fix path for copying in 2.4+ (wrong due to merge from 2.3)
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'