Merge "Unify PROX testcases TG and VNF names"