Merge "[CVP] Fixes for TOOLS_REPO parameter for cvp-func/perf/ha job"