resolves conflicts from cherry-picking tenant name url validation
Merge pull request #2 from jsqu99/tenant-shortname-url-validation

resolves conflicts from cherry-picking tenant name url validation