bug #3421: VM Template update deletes user inputs
(cherry picked from commit ab4d5758fbb507a459e142de68a3cf16d7c384e7)

Conflicts:
	src/sunstone/public/js/plugins/templates-tab.js
bug #3389: % symbol in Template description causes an error in Sunstone
(cherry picked from commit 49ea702ffe8c031f37ff3c24bf805d86661bfaf3)