GUI-1329
escaped name in url
Fixes for #GUI-1385

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

GUI-1329 escaped role name in url
Merge pull request #1077 from thanostx/upstream

Fixes for #GUI-1385
resolved conflicts