Feature/lint drd descriptor file, MCC-58646

-includes fix for iI8n problem we have seen in Jenkins.