Merge "Changes to Regex for Name and version Issue-ID: DCAEGEN2-1867"