Merge "[CPS] Fix statefulset upgrade"