LQE-71 - Fix cancel action on edit template page + dependency for commons-fileupload