Correct a merge error leading to build failure
Merge branch 'branches/rudder/2.7'