Merge "Modify ComputeCapacity scenario host key name"