Merge "Fix vfc-lcm hw vnfname adapt"