Merge "Move mount node after cps test during CSITs"