SCAL-512: hardening validation regexpes
Merge branch 'virtroll-audit-2' into development