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