Merge "[yardstick] fraser opnfv-6.2.1 release tag"