Fixes for #GUI-1385

Make translations fails due to XHTML errors
https://eucalyptus.atlassian.net/browse/GUI-1385
Merge pull request #1077 from thanostx/upstream

Fixes for #GUI-1385