Merge "CSIT: pin wagon version to 2.10"