Merge "Use stable/17.10 branch for VPP"