Changes for Defect_16976: Unable to download a class diagram.
Merge branch 'master'
Merge branch 'Defect_16876_Unable_to_Download_Diagram'