Merge "[CVP,master] Replace hardcode in runCVPrally method"