Fixed: Wrong cancel link in software_install.tpl (client)
CS fixes
(cherry picked from commit 7c1d5b3)
(cherry picked from commit 55e465a)