Fixes #8337 - reworded oVirt template help text
Bug #7619 - [zh_CN] Localized string broken for Loading page
Merge remote branch 'origin/develop' into develop