Add validation when checking the name for CHS orgs
Merge branch 'MH-897' into dev