EUCA-5845 CLC accepts invalid characters for resource names
Merge remote-tracking branch 'origin/testing' into testing