fixes #5881 - XSS from create/update/destroy notification boxes (CVE-2014-3491)
fixes #6149 - fixed XSS in host YAML view (CVE-2014-3492)
Merge remote branch 'origin/develop' into develop