Issue #2341719: Agent machine name generation function uses underscore instead of hyphen when adding a suffix