Merge "Setup automated tests with two replicas of cps-and-ncmp"